all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: typ22@foxmail.com
To: 67427@debbugs.gnu.org
Cc: tiantian <typ22@foxmail.com>
Subject: [bug#67427] [PATCH] guix-install.sh: Fix sys_create_init_profile.
Date: Fri, 24 Nov 2023 14:03:40 +0800	[thread overview]
Message-ID: <tencent_C60863DE02D180AE86E30159A8857129DE05@qq.com> (raw)

From: tiantian <typ22@foxmail.com>

* etc/guix-install.sh (sys_create_init_profile): Remove the redundant colons
in GUIX_LOCPATH and change '||' to '&&'.
---
 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 982fb0a266..4715733245 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -547,13 +547,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
 

base-commit: d20ece07dbb09382f361c8bbf0bcab9e83d8b73e
-- 
2.43.0

Hi guix,

After source /etc/profile, I got
"GUIX_LOCPATH=/home/tt/.guix-home/profile/lib/locale:".

Firstly, it has an extra colon at the end. I checked '/etc/zzz-guix.sh'
and found an extra colon in GUIX_LOCPATH.

Then, I didn't have '.guix-home'. This is an error.
I checked '/etc/zzz-guix.sh' again and found that '||' was used incorrectly.
The second command will not be executed when '$HOME/.guix-home/profile' exists
and is a symbolic link; otherwise, execute the second command.

My English is not good. If there are grammar and tone errors, please forgive me.

Thanks,
tiantian





                 reply	other threads:[~2023-11-24  6:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_C60863DE02D180AE86E30159A8857129DE05@qq.com \
    --to=typ22@foxmail.com \
    --cc=67427@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.