Gentoo Archives: gentoo-alt

From: Etienne Buira <etienne.buira.lists@××××.fr>
To: gentoo-alt@l.g.o
Subject: [gentoo-alt] [PATCH 1/3] scripts/bootstrap-prefix: bugfix: do not arbitrarily overwrite EPREFIX
Date: Sun, 31 Oct 2021 15:39:38
Message-Id: c2cfce11cf9aed2a05d99d8d541174e84966d69f.1635690454.git.etienne.buira.lists@free.fr
1 EPREFIX is given anyway (as $ROOT) when calling bootstrap-prefix.sh with
2 $1 and $2, and a (following) code sets a default value if empty.
3 ---
4 scripts/bootstrap-prefix.sh | 4 +---
5 1 file changed, 1 insertion(+), 3 deletions(-)
6
7 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
8 index 0e21c83953..42b116b0e7 100755
9 --- a/scripts/bootstrap-prefix.sh
10 +++ b/scripts/bootstrap-prefix.sh
11 @@ -2306,9 +2306,7 @@ EOF
12 echo
13 echo "It seems to me you are '${USER:-$(whoami 2> /dev/null)}' (${UID}), that looks cool to me."
14
15 - # Expect noninteractive users to know what they do:
16 - # Take EPREFIX from argv1 (=ROOT), not from env var.
17 - [[ ${TODO} == 'noninteractive' ]] && EPREFIX=${ROOT}
18 + [[ -z "${EPREFIX}" ]] && EPREFIX="${ROOT}"
19
20 echo
21 echo "I'm going to check for some variables in your environment now:"

Replies