X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=bootstrap;h=597959d3340cd476fa65558aea94061972a32ba7;hb=0ad27d198659d8151c157495813666272cfae83e;hp=35474081b870192fd3b076d2150d85514942ff4d;hpb=a0c656364a624716702619ddc36c11c075ac7308;p=chaz%2Ftar diff --git a/bootstrap b/bootstrap index 3547408..597959d 100755 --- a/bootstrap +++ b/bootstrap @@ -24,23 +24,29 @@ # 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]" 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 @@ -48,35 +54,32 @@ build_cvs_prefix() { 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 + -) : ${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 + cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit + trap 0 fi GNULIB_SRCDIR=gnulib @@ -164,14 +167,15 @@ 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 \ + http://www.iro.umontreal.ca/contrib/po/maint/tar/ && + ls *.po | sed 's/\.po$//' >LINGUAS + ) || exit +fi # Reconfigure, getting other files.