Document maintainer tool assumptions a bit. GNU 'sed' is no longer

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index 86ac9618d6acb9adaa20d212a7174671226f548f..3245670d8d9a55e0d3f17e1d474b4e4e12ca31c1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -24,33 +24,59 @@
 
 # Parse options.
 
-for option; do
+for option
+do
   case $option in
   --help)
-    echo "$0: usage: $0 [--gnulib-srcdir=DIR]"
+    echo "$0: usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME]"
     exit;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+  --cvs-auth=*)
+    CVS_AUTH=`expr "$1" : '--cvs-auth=\(.*\)'`;;
+  --cvs-user=*)
+    CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
-
 echo "$0: Bootstrapping CVS tar..."
 
+build_cvs_prefix() {
+  CVS_PREFIX=:${1}:
+  if [ "${2}" != - ]; then
+    CVS_PREFIX=${CVS_PREFIX}${2}@
+  fi
+}
 
 # Get gnulib files.
 
-echo "$0: getting gnulib files..."
-
 case ${GNULIB_SRCDIR--} in
 -)
   if [ ! -d gnulib ]; then
+    echo "$0: getting gnulib files..."
+
     trap exit 1 2 13 15
     trap 'rm -fr gnulib; exit 1' 0
-    cvs -q -d savannah.gnu.org:/cvsroot/gnulib co gnulib  || exit
+    
+    case "${CVS_AUTH--}" in
+    -)       : ${CVS_RSH:?}
+             CVS_PREFIX="";;
+    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs};;
+    gserver|server)
+             build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+    ext)     : ${CVS_RSH:?}
+             build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+    *)       echo "$0: Unknown CVS access method" >&2
+             exit 1;;
+    esac
+    if [ "${CVS_AUTH--}" = "pserver" ]; then
+      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib login || exit
+    fi
+    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+
     trap 0
   fi
   GNULIB_SRCDIR=gnulib
@@ -66,7 +92,7 @@ dirname
 error
 exclude
 fileblocks
-fnmatch
+fnmatch-gnu
 ftruncate
 full-write
 getdate
@@ -78,10 +104,11 @@ human
 lchown
 memset
 modechange
-safe-read
+obstack
 quote
 quotearg
 rmdir
+safe-read
 save-cwd
 savedir
 stdbool