diff mbox series

[bug#60778] guix-install.sh: Source both profiles, default user's and home.

Message ID 87pmbi20qy.fsf@trop.in
State New
Headers show
Series [bug#60778] guix-install.sh: Source both profiles, default user's and home. | expand

Commit Message

Andrew Tropin Jan. 13, 2023, 10:09 a.m. UTC 
* 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(-)

Comments

Ludovic Courtès April 7, 2023, 3:24 p.m. UTC | #1 
Hi,

Andrew Tropin <andrew@trop.in> skribis:

> * etc/guix-install.sh (sys_create_init_profile): Source both profiles, default
> user's and home.

[...]

> +[ -L $GUIX_PROFILE ] || \

[...]

> +[ -L $GUIX_PROFILE ] || \

This should be enclosed in double quotes.

Otherwise LGTM, thanks!

Ludo’.
Andrew Tropin April 9, 2023, 7:07 a.m. UTC | #2 
On 2023-04-07 17:24, Ludovic Courtès wrote:

> Hi,
>
> Andrew Tropin <andrew@trop.in> skribis:
>
>> * etc/guix-install.sh (sys_create_init_profile): Source both profiles, default
>> user's and home.
>
> [...]
>
>> +[ -L $GUIX_PROFILE ] || \
>
> [...]
>
>> +[ -L $GUIX_PROFILE ] || \
>
> This should be enclosed in double quotes.
>
> Otherwise LGTM, thanks!
>
> Ludo’.

Thank you for the review, adjusted, applied and pushed as
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=02033bfc05
diff mbox series

Patch

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
 }