Re: [gentoo-alt] [PATCH v2 1/3] scripts/bootstrap-prefix: bugfix: use given EPREFIX

[Fabian Groffen]

Thanks, pushed all three.

Fabian

On 04-12-2021 08:53:26 +0100, Etienne Buira wrote:
> 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
> ---
>  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:"
> --
> 2.32.0
>
>

-- 
Fabian Groffen
Gentoo on a different level