summary refs log tree commit diff
path: root/etc
diff options
context:
space:
mode:
authorPhilip McGrath <philip@philipmcgrath.com>2022-07-03 22:35:03 -0400
committerLudovic Courtès <ludo@gnu.org>2022-07-04 23:38:38 +0200
commit3348e485b7229e062e563945ed7e6ac216f25125 (patch)
tree7ebcd12acf02655a4c720b3e3107031a27036e6c /etc
parent23aafc800c9e678662766440916449ec5bbce830 (diff)
downloadguix-3348e485b7229e062e563945ed7e6ac216f25125.tar.gz
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>
Diffstat (limited to 'etc')
-rwxr-xr-xetc/guix-install.sh4
1 files changed, 3 insertions, 1 deletions
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