diff options
author | dougb <dougb@FreeBSD.org> | 2009-03-13 08:48:33 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2009-03-13 08:48:33 +0000 |
commit | 9bf35b3af83c3a8eb09ad9871042bdeef50e77cb (patch) | |
tree | 5a4bd367577c6b6b89e3f0166593e9bdce9fc01a /usr.sbin | |
parent | cf13ba2e814e67a01e05cdd42b06906e234e49ac (diff) | |
download | FreeBSD-src-9bf35b3af83c3a8eb09ad9871042bdeef50e77cb.zip FreeBSD-src-9bf35b3af83c3a8eb09ad9871042bdeef50e77cb.tar.gz |
1. Clean up usage() output a bit by grouping options that take an argument
2. Fix a comment to refer to the right loop
Diffstat (limited to 'usr.sbin')
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index e788138..71078aa 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -15,8 +15,8 @@ PATH=/bin:/usr/bin:/usr/sbin display_usage () { VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" - echo 'Usage: mergemaster [-scrvahipCP] [-m /path]' - echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' + echo 'Usage: mergemaster [-scrvahipCPU]' + echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' echo "Options:" echo " -s Strict comparison (diff every pair of files)" echo " -c Use context diff instead of unified diff" @@ -28,6 +28,8 @@ display_usage () { echo ' -p Pre-buildworld mode, only compares crucial files' echo ' -C Compare local rc.conf variables to the defaults' echo ' -P Preserve files that are overwritten' + echo " -U Attempt to auto upgrade files that have not been user modified" + echo '' echo " -m /path/directory Specify location of source to do the make in" echo " -t /path/directory Specify temp root directory" echo " -d Add date and time to directory name (e.g., /var/tmp/temproot.`date +%m%d.%H.%M`)" @@ -35,7 +37,6 @@ display_usage () { echo " -w N Specify a screen width in columns to sdiff" echo " -A architecture Alternative architecture name to pass to make" echo ' -D /path/directory Specify the destination directory to install files to' - echo " -U Attempt to auto upgrade files that have not been user modified." echo '' } @@ -1032,7 +1033,7 @@ for COMPFILE in `find . -type f -size +0`; do esac # Auto run test fi # Yes, the files are different fi # Yes, the file still remains to be checked -done # This is for the do way up there at the beginning of the comparison +done # This is for the for way up there at the beginning of the comparison echo '' echo "*** Comparison complete" |