gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

scripts/bootstrap.sh: tidyups

Browse Source 
Signed-off-by: Zac Medico <zmedico@gentoo.org>
This commit is contained in:
Michael Everitt
2020-01-18 21:05:56 -08:00
committed by Zac Medico
parent a0df0bc2d0
commit 253885e5be
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/bootstrap.sh
View File

@@ -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