| 1 |
commit: 253885e5be3fc395bc746c21962da0aa8b3e32f2 |
| 2 |
Author: Michael Everitt <m.j.everitt <AT> iee <DOT> org> |
| 3 |
AuthorDate: Sun Jan 19 05:05:56 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 19 05:08:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253885e5 |
| 7 |
|
| 8 |
scripts/bootstrap.sh: tidyups |
| 9 |
|
| 10 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/bootstrap.sh | 11 ++++++----- |
| 13 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh |
| 16 |
index d375542f899..03ba014b637 100755 |
| 17 |
--- a/scripts/bootstrap.sh |
| 18 |
+++ b/scripts/bootstrap.sh |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
#!/bin/bash |
| 21 |
-# Copyright 1999-2014 Gentoo Foundation |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
# people who were here: |
| 26 |
@@ -67,9 +67,10 @@ usage() { |
| 27 |
echo -e " ${GOOD}--fetchonly (-f)${NORMAL} Just download all the source files" |
| 28 |
echo -e " ${GOOD}--info (-i)${NORMAL} Show system related information" |
| 29 |
echo -e " ${GOOD}--pretend (-p)${NORMAL} Display the packages that will be merged" |
| 30 |
- echo -e " ${GOOD}--quiet (-q)${NORMAL} Reduced or condensed output from portage's displays." |
| 31 |
+ echo -e " ${GOOD}--quiet (-q)${NORMAL} Reduced or condensed output from portage" |
| 32 |
echo -e " ${GOOD}--tree (-t)${NORMAL} Display the dependency tree, forces -p" |
| 33 |
echo -e " ${GOOD}--resume (-r)${NORMAL} Build/use binary packages" |
| 34 |
+ echo -e " ${GOOD}--verbose (-v)${NORMAL} Verbose output from portage" |
| 35 |
} |
| 36 |
|
| 37 |
STRAP_EMERGE_OPTS="--oneshot" |
| 38 |
@@ -92,7 +93,7 @@ for opt in "$@" ; do |
| 39 |
--quiet|-q) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -q" ; unset STRAP_RUN ;; |
| 40 |
--tree|-t) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -p -t" ; unset STRAP_RUN ;; |
| 41 |
--resume|-r) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --usepkg --buildpkg";; |
| 42 |
- --verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"; V_ECHO=v_echo;; |
| 43 |
+ --verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v" ; V_ECHO=v_echo;; |
| 44 |
--version|-V) |
| 45 |
einfo "Gentoo Linux bootstrap ${cvsver}" |
| 46 |
exit 0 |
| 47 |
@@ -348,7 +349,7 @@ if [[ -n ${STRAP_RUN} ]] ; then |
| 48 |
if [[ -x ${GCC_CONFIG} ]] && ${GCC_CONFIG} --get-current-profile &>/dev/null |
| 49 |
then |
| 50 |
# Make sure we get the old gcc unmerged ... |
| 51 |
- emerge --prune sys-devel/gcc || cleanup 1 |
| 52 |
+ ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1 |
| 53 |
# Make sure the profile and /lib/cpp and /usr/bin/cc are valid ... |
| 54 |
${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null |
| 55 |
fi |
| 56 |
@@ -358,7 +359,7 @@ if [[ -n ${STRAP_RUN} ]] ; then |
| 57 |
echo ------------------------------------------------------------------------------- |
| 58 |
einfo "Please note that you should now add the '-e' option for emerge system:" |
| 59 |
echo |
| 60 |
- einfo " # emerge -e system" |
| 61 |
+ einfo " # emerge <other_opts> -e @system" |
| 62 |
echo |
| 63 |
fi |
Archives