Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Dec 2012 19:40:58 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r244505 - projects/portbuild/pxedust
Message-ID:  <201212201940.qBKJex5p009489@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:40:58 2012
New Revision: 244505
URL: http://svnweb.freebsd.org/changeset/base/244505

Log:
  Add a convenience function.  Really instead this should be etcmerge or
  something.

Modified:
  projects/portbuild/pxedust/pxedust

Modified: projects/portbuild/pxedust/pxedust
==============================================================================
--- projects/portbuild/pxedust/pxedust	Thu Dec 20 19:30:34 2012	(r244504)
+++ projects/portbuild/pxedust/pxedust	Thu Dec 20 19:40:58 2012	(r244505)
@@ -39,7 +39,9 @@ COMMON_ENV="TARGET=${TARGET} TARGET_ARCH
 
 KERNCONF="PACKAGE_NODE_${TARGET}"
 
-LOGFILE="`pwd -P`/diff.out"
+WHEREFROM="`pwd -P`"
+LOGFILE="${WHEREFROM}/diff.out"
+FIXUP="${WHEREFROM}/fixup.sh"
 
 # using a src directory, populate a dst directory, or note differences
 setup () {
@@ -172,4 +174,7 @@ echo "finished."
 echo "  be sure to check ${LOGFILE} for things that have to be adjusted manually:"
 ls -al ${LOGFILE}
 
+grep "^diff" ${LOGFILE} | sed -e "s/^diff/cp -p/" > ${FIXUP}
+echo "  if the < files are a strict superset of the > files, you can just run 'sh ${FIXUP}' ."
+
 exit 0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212201940.qBKJex5p009489>