Fix quoting in help output.

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index 22ccd4964ecc8ff230c0d38cffcc89ac5a08d7bd..9b62069d34419eb33cf51891f5c7945dcd0ca669 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -16,13 +16,13 @@
 
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # Written by Paul Eggert and Sergey Poznyakoff.
 
 # URL of our text domain page in Translation Project
-TP_URL="http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/"
+TP_URL="http://www.iro.umontreal.ca/translation/maint/tar/"
 
 # Ensure file names are sorted consistently across platforms;
 # e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
@@ -52,6 +52,10 @@ 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
 
@@ -67,7 +71,7 @@ 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 &&
@@ -79,6 +83,12 @@ update_po() {
   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
@@ -158,16 +168,20 @@ checkout() {
     fi
     cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
 
-    trap 0
+    trap - 0
   fi
 }
 
-# Prepare temporary module list
-cat /dev/null > modlist.tmp
-trap 'rm -f modlist.tmp' 0 1 2 13 15
+gnulib_modules=
+newline='
+'
 
 get_modules() {
-       sed '/^[        ]*#/d;/^[       ]*$/d' $* >> modlist.tmp
+  new_gnulib_modules=`sed '/^[  ]*#/d; /^[      ]*$/d' $*`
+  case $gnulib_modules,$new_gnulib_modules in
+  ?*,?*) new_gnulib_modules=$newline$new_gnulib_modules;;
+  esac
+  gnulib_modules=$gnulib_modules$new_gnulib_modules
 }
 
 # Get paxutils files
@@ -187,8 +201,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
 }
 
@@ -206,11 +227,12 @@ else
    mkdir rmt
 fi
 
-copy_files ${PAXUTILS_SRCDIR}/rmt rmt
-
-copy_files ${PAXUTILS_SRCDIR}/lib lib
+for dir in doc rmt lib tests
+do
+       copy_files ${PAXUTILS_SRCDIR}/$dir $dir
+done
 
-copy_files ${PAXUTILS_SRCDIR}/tests tests
+copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax
 
 # Get gnulib files.
 
@@ -223,7 +245,7 @@ esac
 
 get_modules gnulib.modules
 
-gnulib_modules=`sort -u modlist.tmp`
+gnulib_modules=`echo "$gnulib_modules" | sort -u`
 previous_gnulib_modules=
 while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   previous_gnulib_modules=$gnulib_modules