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

[Fabian Groffen]

commit:     46b44c2c2080582ca5c48925651ca385c233ffb8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  7 10:53:35 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 10:53:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=46b44c2c

scripts/bootstrap-prefix.sh: fix errors recently introduced

./bootstrap-prefix.sh: line 1652: local: `ROOT/etc/portage/make.conf/': not a 
valid identifier

the assignment doesn't quite like it to be broken up like this, don't
know quite yet, but at least this fixes it

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

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 04a6ef37b1..ccbe9ef905 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1648,12 +1648,12 @@ do_emerge_pkgs() {
                        clang
                        internal-glib
                )
-               local override_make_conf_dir=\
-                       "${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
+               local 
override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
 
                if [[ " ${USE} " == *" prefix-stack "* ]] &&
                   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&
-                  ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' 
"${override_make_conf_dir}"
+                  ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' \
+                  "${override_make_conf_dir}"
                then
                        # With prefix-stack, the USE env var does apply to the 
stacked
                        # prefix only, not the base prefix (any more? since 
some portage