Updated TP URL, improved help output. Default

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index 35474081b870192fd3b076d2150d85514942ff4d..3568ee35dfa75bd8632dbb6076f5aea4bb4eb7da 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -21,62 +21,96 @@
 
 # Written by Paul Eggert.
 
+# URL of our text domain page in Translation Project
+TP_URL="http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/"
+
+usage() {
+ cat <<EOF
+ usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po]
+ Options are:
+ --gnulib-srcdir=DIRNAME      Specify the local directory where gnulib
+                              sources reside. Use this if you already
+                              have gnulib sources on your machine, and
+                              do not want to waste your bandwidth dowloading
+                              them again.
+ --cvs-auth=METHOD            Set the CVS access method used for downloading
+                              gnulib files. METHOD is one of the keywords
+                              accepted by cvs -d option (see info cvs
+                              repository).
+ --cvs-user=USERNAME          Set the CVS username to be used when accessing
+                              the gnulib repository.
+ --no-po                      Do not download po files.
+
+Running without arguments will suffice in most cases. It is equivalent
+to 
+
+    ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+    
+EOF
+}
 
 # Parse options.
 
-for option; do
+DOWNLOAD_PO=yes
+for option
+do
   case $option in
   --help)
-    echo "$0: usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME]"
+    usage
     exit;;
   --gnulib-srcdir=*)
-    GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
   --cvs-auth=*)
-    CVS_AUTH=`expr "$1" : '--cvs-auth=\(.*\)'`;;
+    CVS_AUTH=`expr "$option" : '--cvs-auth=\(.*\)'`;;
   --cvs-user=*)
-    CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
+    CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
+  --no-po)
+    DOWNLOAD_PO=no;;
   *)
     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
+  if [ "$1" = "ext" ]; then
+    if [ -z "${CVS_RSH}" ]; then
+       CVS_RSH=ssh
+       export CVS_RSH
+    fi
+  fi 
 }
 
-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
-
-echo "$0: Bootstrapping CVS tar..."
-
-
 # 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
     
+    case "${CVS_AUTH--}" in
+    -)       build_cvs_prefix ext anoncvs;;
+    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs};;
+    gserver|server)
+             build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+    ext)     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
+    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+
     trap 0
   fi
   GNULIB_SRCDIR=gnulib
@@ -164,14 +198,14 @@ done
 
 # Get translations.
 
-echo "$0: getting translations into po..."
-(cd po &&
- rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
- wget -nv -nd -r -l 1 -A .po -C off \
-   http://www.iro.umontreal.ca/contrib/po/maint/tar/ &&
- ls *.po | sed 's/\.po$//' >LINGUAS
-) || exit
-
+if test "$DOWNLOAD_PO" = "yes"; then
+  echo "$0: getting translations into po..."
+  (cd po &&
+   rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
+    wget -nv -nd -r -l 1 -A .po -C off $TP_URL &&
+    ls *.po | sed 's/\.po$//' >LINGUAS
+  ) || exit
+fi
 
 # Reconfigure, getting other files.