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

[Benda XU]

commit:     ea38c545ce810d80aea1eb7c6e5e4d2117e6f211
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 04:21:00 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 04:22:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ea38c545

bootstrap-prefix.sh: do not take a shortcut if ! is-rap.

 scripts/bootstrap-prefix.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a1cc564f61..1119dabc06 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1163,6 +1163,12 @@ bootstrap_bzip2() {
 }
 
 bootstrap_stage_host_gentoo() {
+       if ! is-rap ; then
+               einfo "Shortcut only supports prefix-standalone, but we are 
bootstrapping"
+               einfo "prefix-rpath. Do nothing."
+               return 0
+       fi
+       
        if [[ ! -L ${ROOT}/tmp ]] ; then
                if [[ -e ${ROOT}/tmp ]] ; then
                        einfo "${ROOT}/tmp exists and is not a symlink to 
${HOST_GENTOO_EROOT}"
@@ -2305,7 +2311,7 @@ EOF
        # Figure out if we are bootstrapping from an existing Gentoo
        # It can be forced by setting HOST_GENTOO_EROOT manually
        local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> 
/dev/null)
-       if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then
+       if [[ ! -d ${HOST_GENTOO_EROOT} && -d ${t_GENTOO_EROOT} ]]; then
                cat <<EOF
 
 Sweet, a Gentoo Penguin is found at ${t_GENTOO_EROOT}.  Hey, you are