(address . guix-patches@gnu.org)
87pmbi20qy.fsf@trop.in
* etc/guix-install.sh (sys_create_init_profile): Source both profiles, default
user's and home.
---
Sourced both profiles and both added to GUIX_LOCPATH if they exist.
return outside of the function AFAIK doesn't make sense, removed it.
In some future we could make a dummy locale-consumer package, which will make
$GUIX_PROFILE/etc/profile export GUIX_LOCPATH, so special treatment in this
script won't be needed anymore.
etc/guix-install.sh | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
Toggle diff (40 lines)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 3ce9affc06..79f5be66b1 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -11,6 +11,7 @@
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2022 Prafulla Giri <prafulla.giri@protonmail.com>
+# Copyright © 2023 Andrew Tropin <andrew@trop.in>
#
# This file is part of GNU Guix.
#
@@ -534,15 +535,19 @@ export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
# searches 'Info-default-directory-list'.
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
-# GUIX_PROFILE: User's default profile
-# Prefer the one from 'guix home' if it exists.
+# 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"
+
GUIX_PROFILE="$HOME/.guix-home/profile"
-[ -L $GUIX_PROFILE ] || GUIX_PROFILE="$HOME/.guix-profile"
-[ -L $GUIX_PROFILE ] || return
-GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
+[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
+[ -L $GUIX_PROFILE ] || \
+GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
+
export GUIX_LOCPATH
-[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
EOF
}
--
2.38.1
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPBMLUACgkQIgjSCVjB
3rDrqQ/+MzfgLFxKMU4k0qC+wDeKNvyjqQFG1unvW3M7Cm0Szedd42Sas52PzdDa
fnIUft2X8S09CUM5p3u/VEpXntEgcyl2WTcAZkaltnreyiPFL4h0EtVU5ksiOirh
MO+//dPVr5/JDO/u8rwT2brz5pg8eeUt2ji8Ehq8MTq1sWcyZKkGm57l4wLSIfqC
dD8r3t1GVnS4rVb4JgodUFxwNNkqxg7JOezsisMvKiEGYzqBgAK1UyHf1v/wS4iV
w9bvGkkSuhkYvRBKeicljMu4tUqUssjeKiNgecw2I97tdMA57entUkQ7h2mNRZgn
tWSvvR7a7s5vp8hrUL+7HCI9QpHWEq29dPuZAtpmoM1t5yGwpSUL224A0Np3DRbx
HRVs1uSHbunIv3FV+pQ8oDpr8OlhAJzLTnYfGgsv+N4PrAht5sHR/QNn9l3kFjgI
bvwB39uOJTq4CVi8Neq9cvAnnnvKDiospZY7oFM0KwxEU/kgm1fvdYhHmbQFP893
SePwcwpnYwSLIv9TeZUsdSHEYEavbPmxD+uMLOme1Ks+6hkI5TR5fHC/W5ljTXWK
ulS3lCENMF7dFkpPHuxt1DvFjZWM3Tfaf+eG5RkCE9JQfnelC3xO2wFWQFC/jUf1
CjTtCW8Rp17cGeGpfSHFha6UJkhgB0J5fmEob7WLgf0EU/2mXek=
=css4
-----END PGP SIGNATURE-----