diff options
| author |   Michael Everitt <m.j.everitt@iee.org> | 2020-01-18 21:05:56 -0800 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2020-01-18 21:08:39 -0800 |
| commit | 253885e5be3fc395bc746c21962da0aa8b3e32f2 (patch) | |
| tree | 889035ac719a81b8c57d4384c1b996cbadc8d8c0 /scripts | |
| parent | sys-apps/pkgcore: Add myself as co-maint (diff) | |
| download | gentoo-253885e5be3fc395bc746c21962da0aa8b3e32f2.tar.gz gentoo-253885e5be3fc395bc746c21962da0aa8b3e32f2.tar.bz2 gentoo-253885e5be3fc395bc746c21962da0aa8b3e32f2.zip | |
scripts/bootstrap.sh: tidyups
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index d375542f8998..03ba014b6372 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # people who were here: @@ -67,9 +67,10 @@ usage() { echo -e " ${GOOD}--fetchonly (-f)${NORMAL} Just download all the source files" echo -e " ${GOOD}--info (-i)${NORMAL} Show system related information" echo -e " ${GOOD}--pretend (-p)${NORMAL} Display the packages that will be merged" - echo -e " ${GOOD}--quiet (-q)${NORMAL} Reduced or condensed output from portage's displays." + echo -e " ${GOOD}--quiet (-q)${NORMAL} Reduced or condensed output from portage" echo -e " ${GOOD}--tree (-t)${NORMAL} Display the dependency tree, forces -p" echo -e " ${GOOD}--resume (-r)${NORMAL} Build/use binary packages" + echo -e " ${GOOD}--verbose (-v)${NORMAL} Verbose output from portage" } STRAP_EMERGE_OPTS="--oneshot" @@ -92,7 +93,7 @@ for opt in "$@" ; do --quiet|-q) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -q" ; unset STRAP_RUN ;; --tree|-t) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -p -t" ; unset STRAP_RUN ;; --resume|-r) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --usepkg --buildpkg";; - --verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"; V_ECHO=v_echo;; + --verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v" ; V_ECHO=v_echo;; --version|-V) einfo "Gentoo Linux bootstrap ${cvsver}" exit 0 @@ -348,7 +349,7 @@ if [[ -n ${STRAP_RUN} ]] ; then if [[ -x ${GCC_CONFIG} ]] && ${GCC_CONFIG} --get-current-profile &>/dev/null then # Make sure we get the old gcc unmerged ... - emerge --prune sys-devel/gcc || cleanup 1 + ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1 # Make sure the profile and /lib/cpp and /usr/bin/cc are valid ... ${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null fi @@ -358,7 +359,7 @@ if [[ -n ${STRAP_RUN} ]] ; then echo ------------------------------------------------------------------------------- einfo "Please note that you should now add the '-e' option for emerge system:" echo - einfo " # emerge -e system" + einfo " # emerge <other_opts> -e @system" echo fi |