@@ -1980,8 +1980,8 @@ bootstrap_stage2() {
1980
1980
fi
1981
1981
elif ! is-rap ; then
1982
1982
# make sure the EPREFIX gcc shared libraries are there
1983
- mkdir -p " ${ROOT} " /usr/${CHOST} /lib/gcc
1984
- cp " ${ROOT} " /tmp/usr/${CHOST} /lib/gcc/* " ${ROOT} " /usr/${CHOST} /lib/gcc
1983
+ mkdir -p " ${ROOT} /usr/${CHOST} /lib/gcc"
1984
+ cp " ${ROOT} /tmp/usr/${CHOST} /lib/gcc" /* " ${ROOT} /usr/${CHOST} /lib/gcc"
1985
1985
fi
1986
1986
1987
1987
estatus " stage2 finished"
@@ -2326,10 +2326,10 @@ bootstrap_stage3() {
2326
2326
export USE=" -git -crypt -http2"
2327
2327
2328
2328
# Portage should figure out itself what it needs to do, if anything.
2329
- eflags=" --deep --update --changed-use @system"
2330
- einfo " running emerge ${eflags} "
2331
- estatus " stage3: emerge ${eflags} "
2332
- emerge --color n -v ${eflags} || return 1
2329
+ local eflags=( " --deep" " --update" " --changed-use" " @system" )
2330
+ einfo " running emerge ${eflags[*] } "
2331
+ estatus " stage3: emerge ${eflags[*] } "
2332
+ emerge --color n -v " ${eflags[@]} " || return 1
2333
2333
2334
2334
# Remove anything that we don't need (compilers most likely)
2335
2335
einfo " running emerge --depclean"
@@ -2462,10 +2462,10 @@ EOF
2462
2462
# note that this code is so complex because it handles both
2463
2463
# C-shell as well as *sh
2464
2464
dvar=" echo \" ((${flag} =\$ {${flag} }))\" "
2465
- dvar=" $( echo " ${dvar} " | env -i HOME=$ HOME $SHELL -l 2> /dev/null) "
2465
+ dvar=" $( echo " ${dvar} " | env -i HOME=" ${ HOME} " " $SHELL " -l 2> /dev/null) "
2466
2466
if [[ ${dvar} == * " ((${flag} =" ?* " ))" ]] ; then
2467
2467
badflags=" ${badflags} ${flag} "
2468
- dvar=${dvar#* ((${flag} =}
2468
+ dvar=${dvar#* " ((${flag} =" }
2469
2469
dvar=${dvar%% ))* }
2470
2470
echo " uh oh, ${flag} =${dvar} :("
2471
2471
else
@@ -2616,7 +2616,7 @@ necessary to add to PATH for me to find a compiler. I start off with
2616
2616
PATH=${PATH} and will add anything you give me here.
2617
2617
EOF
2618
2618
[[ ${TODO} == ' noninteractive' ]] && ans=" ${usergcc%/ gcc} " ||
2619
- read -p " Where can I find your compiler? [] " ans
2619
+ read -r - p " Where can I find your compiler? [] " ans
2620
2620
case " ${ans} " in
2621
2621
" " )
2622
2622
: ;;
@@ -2707,7 +2707,7 @@ clue what this means, you should go with my excellent default I've
2707
2707
chosen below, really!
2708
2708
EOF
2709
2709
[[ ${TODO} == ' noninteractive' ]] && ans=" " ||
2710
- read -p " How many parallel make jobs do you want? [${tcpu} ] " ans
2710
+ read -r - p " How many parallel make jobs do you want? [${tcpu} ] " ans
2711
2711
case " ${ans} " in
2712
2712
" " )
2713
2713
MAKEOPTS=" -j${tcpu} "
@@ -2794,11 +2794,11 @@ EOF
2794
2794
case " ${CHOST} " in
2795
2795
x86_64-* |sparcv9-* ) # others can't do multilib, so don't bother
2796
2796
# 64-bits native
2797
- read -p " How many bits do you want your Prefix to target? [64] " ans
2797
+ read -r - p " How many bits do you want your Prefix to target? [64] " ans
2798
2798
;;
2799
2799
* )
2800
2800
# 32-bits native
2801
- read -p " How many bits do you want your Prefix to target? [32] " ans
2801
+ read -r - p " How many bits do you want your Prefix to target? [32] " ans
2802
2802
;;
2803
2803
esac
2804
2804
case " ${ans} " in
@@ -2833,7 +2833,7 @@ really a Gentoo lover, aren't you? Me too! By leveraging the existing
2833
2833
portage, we can save a lot of time."
2834
2834
EOF
2835
2835
[[ ${TODO} == ' noninteractive' ]] && ans=no ||
2836
- read -p " Do you want me to take the shortcut? [yN] " ans
2836
+ read -r - p " Do you want me to take the shortcut? [yN] " ans
2837
2837
case " ${ans} " in
2838
2838
[Yy][Ee][Ss]|[Yy])
2839
2839
echo " Good!"
@@ -2864,7 +2864,7 @@ by default. Of course, you can still enable testing ~amd64 for
2864
2864
the packages you want, when the need arises.
2865
2865
EOF
2866
2866
[[ ${TODO} == ' noninteractive' ]] && ans=yes ||
2867
- read -p " Do you want to use stable Prefix? [Yn] " ans
2867
+ read -r - p " Do you want to use stable Prefix? [Yn] " ans
2868
2868
case " ${ans} " in
2869
2869
[Yy][Ee][Ss]|[Yy]|" " )
2870
2870
echo " Okay, I'll disable ~amd64 by default."
@@ -2901,7 +2901,7 @@ EOF
2901
2901
fi
2902
2902
echo
2903
2903
[[ ${TODO} == ' noninteractive' ]] && ans= ||
2904
- read -p " What do you want EPREFIX to be? [$EPREFIX ] " ans
2904
+ read -r - p " What do you want EPREFIX to be? [$EPREFIX ] " ans
2905
2905
case " ${ans} " in
2906
2906
" " )
2907
2907
: ;;
@@ -2987,7 +2987,7 @@ happen.
2987
2987
EOF
2988
2988
echo
2989
2989
[[ ${TODO} == ' noninteractive' ]] && ans=" " ||
2990
- read -p " Type here what you want to wish me [luck] " ans
2990
+ read -r - p " Type here what you want to wish me [luck] " ans
2991
2991
if [[ -n ${ans} && ${ans} != " luck" ]] ; then
2992
2992
echo " Huh? You're not serious, are you?"
2993
2993
sleep 3
@@ -3004,7 +3004,7 @@ EOF
3004
3004
[[ -n ${SETUP_ENV_ONLY} ]] && return 0
3005
3005
3006
3006
if [[ -d ${HOST_GENTOO_EROOT} ]]; then
3007
- if ! [[ -x ${EPREFIX} /tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} " ${EPREFIX} " stage_host_gentoo ; then
3007
+ if ! [[ -x ${EPREFIX} /tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} " ${BASH_SOURCE[0]} " " ${EPREFIX} " stage_host_gentoo ; then
3008
3008
# stage host gentoo fail
3009
3009
cat << EOF
3010
3010
@@ -3060,7 +3060,7 @@ EOF
3060
3060
3061
3061
local https_needed=no
3062
3062
if ! [[ -e ${EPREFIX} /.stage2-finished ]] \
3063
- && ! ${BASH} ${BASH_SOURCE[0]} " ${EPREFIX} " stage2_log ; then
3063
+ && ! ${BASH} " ${BASH_SOURCE[0]} " " ${EPREFIX} " stage2_log ; then
3064
3064
# stage 2 fail
3065
3065
cat << EOF
3066
3066
@@ -3101,7 +3101,7 @@ EOF
3101
3101
hash -r
3102
3102
3103
3103
if ! [[ -e ${EPREFIX} /.stage3-finished ]] \
3104
- && ! bash ${BASH_SOURCE[0]} " ${EPREFIX} " stage3_log ; then
3104
+ && ! bash " ${BASH_SOURCE[0]} " " ${EPREFIX} " stage3_log ; then
3105
3105
# stage 3 fail
3106
3106
hash -r # previous cat (tmp/usr/bin/cat) may have been removed
3107
3107
cat << EOF
@@ -3181,7 +3181,7 @@ EOF
3181
3181
exit 1
3182
3182
fi
3183
3183
3184
- if ! bash ${BASH_SOURCE[0]} " ${EPREFIX} " startscript ; then
3184
+ if ! bash " ${BASH_SOURCE[0]} " " ${EPREFIX} " startscript ; then
3185
3185
# startscript fail?
3186
3186
cat << EOF
3187
3187
@@ -3326,7 +3326,7 @@ if [[ ${CHOST} == *-linux-* ]] ; then
3326
3326
done
3327
3327
3328
3328
platform=${CHOST#* -} ; platform=${platform%% -* }
3329
- platform=$( rapx rap ${platform} )
3329
+ platform=$( rapx rap " ${platform} " )
3330
3330
CHOST_IDENTIFY=${CHOST%% -* } -${platform} -linux-${dist,,}${rel}
3331
3331
fi
3332
3332
@@ -3442,7 +3442,7 @@ einfo "ident: ${CHOST_IDENTIFY}"
3442
3442
einfo " prefix: ${ROOT} "
3443
3443
3444
3444
TODO=${2}
3445
- if [[ ${TODO} != " noninteractive" && $( type -t bootstrap_${TODO} ) != " function" ]];
3445
+ if [[ ${TODO} != " noninteractive" && $( type -t " bootstrap_${TODO} " ) != " function" ]];
3446
3446
then
3447
3447
eerror " bootstrap target ${TODO} unknown"
3448
3448
exit 1
3477
3477
3478
3478
# call the appropriate function,
3479
3479
# beware noninteractive is just a mode of interactive
3480
- bootstrap_${TODO# non} || exit 1
3480
+ bootstrap_" ${TODO# non} " || exit 1
3481
3481
3482
3482
# Local Variables:
3483
3483
# sh-indentation: 4
0 commit comments