X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=bootstrap;h=3245670d8d9a55e0d3f17e1d474b4e4e12ca31c1;hb=475a54cc06d3bf2f61efcd6171c3b9ca9518b559;hp=35474081b870192fd3b076d2150d85514942ff4d;hpb=a0c656364a624716702619ddc36c11c075ac7308;p=chaz%2Ftar diff --git a/bootstrap b/bootstrap index 3547408..3245670 100755 --- a/bootstrap +++ b/bootstrap @@ -24,7 +24,8 @@ # Parse options. -for option; do +for option +do case $option in --help) echo "$0: usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME]" @@ -41,6 +42,8 @@ for option; do esac done +echo "$0: Bootstrapping CVS tar..." + build_cvs_prefix() { CVS_PREFIX=:${1}: if [ "${2}" != - ]; then @@ -48,35 +51,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