[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/

[Fabian Groffen]

commit:     2f1b427e47422df8c7e6d1504d89988fa48fe004
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 17:28:11 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 22 17:28:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f1b427e

scripts/auto-bootstraps/dobootstrap: refine shell usage

- reuse bash shell the script was invoked with to launch
  bootstrap-prefix.sh
- set SHELL=/bin/sh for maximum compatability
- avoid env exec error when GENTOO_MIRRORS is empty

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/auto-bootstraps/dobootstrap | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/auto-bootstraps/dobootstrap 
b/scripts/auto-bootstraps/dobootstrap
index e27bb0eeee..de986e0169 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -112,18 +112,18 @@ do_prepare() {
        starttime=${SECONDS}
        env -i \
                HOME=${EPREFIX} \
-               SHELL=/bin/bash \
+               SHELL=/bin/sh \
                TERM=${TERM} \
                USER=${USER} \
                CHOST=${chost} \
                EPREFIX=${EPREFIX} \
-               ${GENTOO_MIRRORS+GENTOO_MIRRORS=}${GENTOO_MIRRORS} \
+               ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
                ${DOLOCAL+DOLOCAL=1} \
                ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \
                ${RESUME+RESUME=1} \
                ${LATEST_TREE_YES+LATEST_TREE_YES=1} \
                ${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
-               ${keepalive} /bin/bash -l -c "${BASH} ${bootstrapscript} 
bootstrap"
+               ${keepalive} ${BASH} ${bootstrapscript} bootstrap
        endtime=${SECONDS}
 
        if [[ -n ${DOPUBLISH} ]] ; then