* NEWS: --version now outputs copyright etc., to conform to the

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index d62061725623f3fd2e6149aba42a3a7e2df7b289..ccad55ce9dcb3ed08fdd3bf0f58c3d937e2220d6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap 'tar' from CVS.
 
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,10 +52,14 @@ usage() {
  --no-po                      Do not download po files.
  --update-po[=LANG]           Update po file(s) and exit.
 
+If the file \`.bootstrap' exists in the current working directory, its
+contents is read, comments and empty lines removed, shell variables expanded
+and the result is prepended to the command line options.
+
 Running without arguments will suffice in most cases. It is equivalent
 to
 
-    ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+    ./bootstrap --cvs-auth=pserver
 
 EOF
 }
@@ -67,18 +71,24 @@ update_po() {
     *)     POFILE=${1}.po;;
     esac
     echo "$0: getting translation for $1..."
-    wget -r -C off $TP_URL/$POFILE
+    wget -r --cache=off $TP_URL/$POFILE
   else
     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 &&
+      wget -nv -nd -r -l 1 -A .po --cache off $TP_URL &&
       rm -f index.html index.html.[0-9]*
       ls *.po | sed 's/\.po$//' >LINGUAS
     ) || exit
   fi
 }
 
+# Read configuration file
+if [ -r .bootstrap ]; then
+  echo "$0: Reading configuration file .bootstrap"
+  eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
+fi
+
 # Parse options.
 
 DOWNLOAD_PO=yes
@@ -140,10 +150,8 @@ checkout() {
     trap exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
 
-    case "${CVS_AUTH--}" in
-    -)       build_cvs_prefix ext anoncvs
-             ;;
-    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs}
+    case "${CVS_AUTH-pserver}" in
+    pserver) build_cvs_prefix pserver ${CVS_USER:-anonymous}
              ;;
     gserver|server)
             build_cvs_prefix $CVS_AUTH ${CVS_USER--}
@@ -153,10 +161,7 @@ checkout() {
     *)       echo "$0: Unknown CVS access method" >&2
             exit 1;;
     esac
-    if [ "${CVS_AUTH--}" = "pserver" ]; then
-      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
-    fi
-    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
+    cvs -q -d ${CVS_PREFIX}cvs.sv.gnu.org:/cvsroot/$1 co $1 || exit
 
     trap - 0
   fi
@@ -191,8 +196,15 @@ copy_files() {
     case $file in
     "#*")  continue;;
     esac
-    echo "$0: Copying file $1/$file"
-    cp -p $1/$file $2/`expr $file : '.*/\(.*\)'`
+    dst=`echo $file | sed 's^.*/^^'`
+    if [ $# -eq 3 ]; then
+      case $dst in
+      ${3}*) ;;
+      *) dst=${3}$dst;;
+      esac
+    fi
+    echo "$0: Copying file $1/$file to $2/$dst"
+    cp -p $1/$file $2/$dst
   done
 }
 
@@ -215,6 +227,8 @@ do
        copy_files ${PAXUTILS_SRCDIR}/$dir $dir
 done
 
+copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in