guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#56050] [PATCH v2 2/2] etc/guix-install.sh: Check for profile from '


From: Andrew Tropin
Subject: [bug#56050] [PATCH v2 2/2] etc/guix-install.sh: Check for profile from 'guix home'.
Date: Tue, 12 Jul 2022 09:44:51 +0300

On 2022-07-03 22:35, Philip McGrath wrote:

> If "$HOME/.guix-home/profile" exists, use it for GUIX_PROFILE instead of
> "$HOME/.guix-profile".
>
> * etc/guix-install.sh (sys_create_init_profile): Check for 'guix home'
> profile.
> ---
>  etc/guix-install.sh | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/etc/guix-install.sh b/etc/guix-install.sh
> index 62a33a55c4..300681e111 100755
> --- a/etc/guix-install.sh
> +++ b/etc/guix-install.sh
> @@ -524,7 +524,9 @@ export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
>  export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
>  
>  # GUIX_PROFILE: User's default profile
> -GUIX_PROFILE="$HOME/.guix-profile"
> +# Prefer the one from 'guix home' if it exists.
> +GUIX_PROFILE="$HOME/.guix-home/profile"
> +[ -L $GUIX_PROFILE ] || GUIX_PROFILE="$HOME/.guix-profile"
>  [ -L $GUIX_PROFILE ] || return
>  GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
>  export GUIX_LOCPATH

I think here we don't need to prefer one over another.  Let's just
repeat the process for both of them.  If home profile exists source it,
if user profile exists source it as well.

-- 
Best regards,
Andrew Tropin

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]