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