07/10: guix-install.sh: Fix setting GUIX_LOCPATH.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 08bb2dbb13cc7180a9d8316f9d52b6f7a20d5e8d
Author: Tomas Volf <~@wolfsden.cz>
AuthorDate: Fri Apr 5 19:09:37 2024 +0200

    guix-install.sh: Fix setting GUIX_LOCPATH.
    
    After installing Guix home on my new foreign system, the locale did not
    work and GDM did not even let me to log in.  After some digging around using
    tty3 and tty4, I realized the GUIX_LOCPATH is not being set properly.
    
    I had nothing installed in the ~/.guix-profile (the symlink did not even
    exist) and I had glibc-locales installed in ~/.guix-home, yet GUIX_LOCPATH
    contained "$HOME/.guix-profile/lib/locale:".
    
    I believe when the code was modified from the original "home or profile" to
    the current "home and profile" the || was used by accident instead of &&.
    
    I also remove the trailing :, since it is taken care of by the ${...:+:}.
    
    * etc/guix-install.sh (sys_create_init_profile):
    
    Change-Id: I8a3287fe809af58aee2edc924154eecf91fa1eb8
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 etc/guix-install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 3d9c9f4e58..82accfd5d5 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -635,13 +635,13 @@ export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
 # GUIX_PROFILE: User's default profile and home profile
 GUIX_PROFILE="$HOME/.guix-profile"
 [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
-[ -L "$GUIX_PROFILE" ] || \
-GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
+[ -L "$GUIX_PROFILE" ] && \
+GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
 
 GUIX_PROFILE="$HOME/.guix-home/profile"
 [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
-[ -L "$GUIX_PROFILE" ] || \
-GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
+[ -L "$GUIX_PROFILE" ] && \
+GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
 
 export GUIX_LOCPATH