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

[Fabian Groffen]

commit:     02f3aa274e132ac4e78423361e9e82da765d11c6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:45:29 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 10:46:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=02f3aa27

scripts/auto-bootstraps/dobootstrap: handle unfetchable bootstrap script

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

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

diff --git a/scripts/auto-bootstraps/dobootstrap 
b/scripts/auto-bootstraps/dobootstrap
index 983cf65977..c237433034 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -31,7 +31,8 @@ do_prepare() {
                
bootstrap=${OVERRIDE_EPREFIX:-bootstrap${bitw}-${dte}}/bootstrap-prefix.sh
        elif [[ -n ${DOLOCAL} ]] ; then
                bootstrap=${BOOTSTRAP}
-       else
+       fi
+       if [[ ! -e ${bootstrap} ]] ; then
                bootstrap=dobootstrap-do_prepare-$$
                do_fetch ${BOOTURL} > ${bootstrap}
        fi
@@ -144,7 +145,7 @@ do_prepare() {
                echo $((endtime - starttime)) > elapsedtime
 
                # get identification of host that includes Linux distro, RAP, 
...
-               chost=$(${BASH} ${bootstrap} chost.identify x)
+               chost=$(${BASH} ./bootstrap-prefix.sh chost.identify x)
 
                rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
                rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
@@ -200,7 +201,7 @@ case $1 in
                ;;
        *)
                bitw=
-               if [[ ${0} == /net/* ]] ; then
+               if [[ ${0} == /net/* || ${0} == /System/* ]] ; then
                        echo "internal host, activating local and DOPUBLISH"
                        export DOLOCAL=1
                        export DOPUBLISH=1