etc/guix-install.sh: Check for profile from 'guix home'.

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.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Philip McGrath 2022-07-03 22:35:03 -04:00 committed by Ludovic Courtès
parent 23aafc800c
commit 3348e485b7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5

@ -524,7 +524,9 @@ export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
# GUIX_PROFILE: User's default profile # 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 [ -L $GUIX_PROFILE ] || return
GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
export GUIX_LOCPATH export GUIX_LOCPATH