guix-commits
[Top][All Lists]
Advanced

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

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


From: guix-commits
Subject: 02/03: etc/guix-install.sh: Check for profile from 'guix home'.
Date: Mon, 4 Jul 2022 17:40:19 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 3348e485b7229e062e563945ed7e6ac216f25125
Author: Philip McGrath <philip@philipmcgrath.com>
AuthorDate: Sun Jul 3 22:35:03 2022 -0400

    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>
---
 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



reply via email to

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