diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-01-16 11:58:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-16 11:58:31 +0000 |
| commit | 05108c4852a602e378992cca4c40e795b9b9c97b (patch) | |
| tree | 6803745f1bf0e9e22bf4e6509eb3b788bba02e8f /scripts | |
| parent | add more KEYWORDS (Manifest recommit) (diff) | |
| download | gentoo-2-05108c4852a602e378992cca4c40e795b9b9c97b.tar.gz gentoo-2-05108c4852a602e378992cca4c40e795b9b9c97b.tar.bz2 gentoo-2-05108c4852a602e378992cca4c40e795b9b9c97b.zip | |
dont announce a resume if there isnt one yet ;)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7a16cc1db925..b689724a116b 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.69 2005/01/14 02:30:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.70 2005/01/16 11:58:31 vapier Exp $ # people who were here: # (drobbins, 06 Jun 2003) @@ -31,7 +31,7 @@ show_status() { # semi-transparent resuming progressfile=/var/run/bootstrap-progress [[ -e ${progressfile} ]] && source ${progressfile} -export BOOTSTRAP_STAGE="${BOOTSTRAP_STAGE:-1}" +export BOOTSTRAP_STAGE=${BOOTSTRAP_STAGE:-1} set_bootstrap_stage() { [[ -z ${STRAP_RUN} ]] && return 0 export BOOTSTRAP_STAGE=$1 @@ -75,7 +75,7 @@ for opt in "$@" ; do --resume|-r) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --usepkg --buildpkg";; --verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"; V_ECHO=v_echo;; --version) - cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.69 2005/01/14 02:30:51 vapier Exp $" + cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.70 2005/01/16 11:58:31 vapier Exp $" cvsver=${cvsver##*,v } einfo "Gentoo ${GENTOO_VERS} bootstrap ${cvsver%%Exp*}" exit 0 @@ -96,7 +96,7 @@ if [[ -n ${STRAP_RUN} ]] ; then einfo "Press enter to continue or CTRL+C to abort ..." read set_bootstrap_stage 1 - else + elif [ ${BOOTSTRAP_STAGE} -gt 1 ] ; then einfo "Resuming bootstrap at internal stage #${BOOTSTRAP_STAGE} ..." fi else |