commit: bc9fc5509ac815945e287ef70e89cb21b34808fc
Author: Etienne Buira <etienne.buira.lists <AT> free <DOT> fr>
AuthorDate: Sat Dec 4 07:53:26 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 5 13:42:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bc9fc550
scripts/bootstrap-prefix: bugfix: use given EPREFIX
Using $1 should not be reserved to uninteractive
v2:
- leave some comment
- not moved down, because the following environment sanitiser unsets
$ROOT
- shortened $subject
Thanks grobian for review
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1c6c42dad6..a2b1db7235 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2322,9 +2322,8 @@ EOF
echo
echo "It seems to me you are '${USER:-$(whoami 2> /dev/null)}'
(${UID}), that looks cool to me."
- # Expect noninteractive users to know what they do:
- # Take EPREFIX from argv1 (=ROOT), not from env var.
- [[ ${TODO} == 'noninteractive' ]] && EPREFIX=${ROOT}
+ # In case $ROOT were specified as $1, use it
+ [[ -z "${EPREFIX}" ]] && EPREFIX="${ROOT}"
echo
echo "I'm going to check for some variables in your environment now:"
