commit: a24caba8b099b2425307b738a88768abbdc7b724 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Jun 8 07:31:22 2021 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Jun 8 07:31:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a24caba8
scripts/bootstrap-prefix: ensure ORIGINAL_PATH is truely original Thanks to suggestion of Alfred Wingate in bug 788334. The value of ORIGINAL_PATH wasn't quite that original. Move setting the var before we tamper with PATH. Closes: https://bugs.gentoo.org/788334 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> scripts/bootstrap-prefix.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index d1108e6eac..97ffa2233d 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -3113,6 +3113,9 @@ case ${CHOST}:${LC_ALL}:${LANG} in ;; esac +# save original path, need this before interactive, #788334 +ORIGINAL_PATH="${PATH}" + # Just guessing a prefix is kind of scary. Hence, to make it a bit less # scary, we force the user to give the prefix location here. This also # makes the script a bit less dangerous as it will die when just run to @@ -3135,7 +3138,6 @@ elif [[ -z $1 ]] ; then fi ROOT="$1" -ORIGINAL_PATH="${PATH}" set_helper_vars case $ROOT in
