[Cvs-cvs] ccvs ./ChangeLog maint-aux/gnulib-update

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/12 19:34:59

Modified files:
        .              : ChangeLog 
        maint-aux      : gnulib-update 

Log message:
        * maint-aux/gnulib-update: Add help text and argument checking.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1287&tr2=1.1288&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/maint-aux/gnulib-update.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1287 ccvs/ChangeLog:1.1288
--- ccvs/ChangeLog:1.1287       Wed Apr 12 18:09:11 2006
+++ ccvs/ChangeLog      Wed Apr 12 19:34:59 2006
@@ -1,6 +1,7 @@
 2006-04-12  Derek Price  <address@hidden>
 
-       * maint-aux/gnulib-update: Allow import of new modules.
+       * maint-aux/gnulib-update: Allow import of new modules.  Add help text
+       and argument checking.
 
        * m4/time_r.m4: Update form GNULIB.
 
Index: ccvs/maint-aux/gnulib-update
diff -u ccvs/maint-aux/gnulib-update:1.7 ccvs/maint-aux/gnulib-update:1.8
--- ccvs/maint-aux/gnulib-update:1.7    Wed Apr 12 18:09:11 2006
+++ ccvs/maint-aux/gnulib-update        Wed Apr 12 19:34:59 2006
@@ -14,7 +14,46 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+usage()
+{
+  cat <<EOF
+usage: `basename $0` [--help]
+       `basename $0` [--import MODULE...]
+EOF
+}
+
+# Where to find the GNULIB sources.
+GNULIB_DEFAULT=../gnulib
+: ${GNULIB=$GNULIB_DEFAULT}
+GNULIB_TOOL=$GNULIB/gnulib-tool
+
+if test x"$1" == x--help; then
+  usage
+  cat <<EOF
+
+Run without arguments, `basename $0` will update the local GNULIB modules to
+the most recent versions found in \$GNULIB (defaults to \`$GNULIB').
+ 
+OPTIONS
+  --help              Display this text.
+  --import MODULE...  Import new GNULIB module MODULE, in addition to updating
+                      all previously imported modules.
+
+ENVIRONMENT
+  \$GNULIB            The directory to search for new GNULIB modules.
+EOF
+  exit 0
+fi
+
+if test -n "$1"; then
+  if test x"$1" != x--import || test -z "$2"; then
+    usage >&2
+    exit 2
+  fi
+  shift
+fi
 
 if test -f maint-aux/gnulib-update; then :; else
   >&2 echo \
@@ -22,10 +61,6 @@
   exit 2
 fi
 
-# Where to find the GNULIB sources.
-: ${GNULIB="../gnulib"}
-GNULIB_TOOL=$GNULIB/gnulib-tool
-
 # Are the GNULIB sources really where we expect them?
 if test -r $GNULIB && test -d $GNULIB \
    && test -r $GNULIB_TOOL && test -f $GNULIB_TOOL; then :; else