From patchwork Fri Nov 24 06:03:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tiantian X-Patchwork-Id: 56792 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0632027BBE2; Fri, 24 Nov 2023 06:44:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9EE3127BBE9 for ; Fri, 24 Nov 2023 06:44:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Pv5-0007Vw-KL; Fri, 24 Nov 2023 01:44:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Puw-0007TN-Cz for guix-patches@gnu.org; Fri, 24 Nov 2023 01:43:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r6Puv-0006uN-Jp for guix-patches@gnu.org; Fri, 24 Nov 2023 01:43:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6Puz-0007Yh-S5 for guix-patches@gnu.org; Fri, 24 Nov 2023 01:44:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67427] [PATCH] guix-install.sh: Fix sys_create_init_profile. Resent-From: typ22@foxmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Nov 2023 06:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67427 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67427@debbugs.gnu.org Cc: tiantian X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170080821029003 (code B ref -1); Fri, 24 Nov 2023 06:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Nov 2023 06:43:30 +0000 Received: from localhost ([127.0.0.1]:35517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6PuT-0007Xi-68 for submit@debbugs.gnu.org; Fri, 24 Nov 2023 01:43:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:34454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6PuO-0007XI-3J for submit@debbugs.gnu.org; Fri, 24 Nov 2023 01:43:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Ptx-000542-U2 for guix-patches@gnu.org; Fri, 24 Nov 2023 01:42:59 -0500 Received: from out162-62-57-210.mail.qq.com ([162.62.57.210]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Pts-0006YO-Hf for guix-patches@gnu.org; Fri, 24 Nov 2023 01:42:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1700808165; bh=PRG+83T7LMyspjtY9Y0vyxPhp9VjRpuin1hc4/ZKXMg=; h=From:To:Cc:Subject:Date; b=iBfrkLAfLAq9zpD+OfvPSKDL5BHUEygV8Nwy9DKpCmIBq95QykpFHSzqpJZcjvwP6 c81XoXaVOxUz/oYipgUHOc54qakGVd+OYhqE2nH9IieOpwwMuMOtWkgWPuyhT5ocuH BTgFYTS/p8zMHwVRE35IhBDAojX7qs/yH0nxCuxg= Received: from tt-arch.localdomain ([101.94.248.238]) by newxmesmtplogicsvrszc5-1.qq.com (NewEsmtp) with SMTP id 9DBB1666; Fri, 24 Nov 2023 14:39:27 +0800 X-QQ-mid: xmsmtpt1700807967tw3ei7u5z Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0aQbYFlfSbOCYBqKqvkJiv07oA9/wdf2J6FGdp+5oeMXYtT4nhvI tKDeUCFk9zrDQZxzKeEdTV3lh2oeD2K0pjQD5Z6cMASR8zmM2QDC5jr5Vr3SvLdfBVc+qJkdQ6e0 xiBDn0sZnGYOgNlFlottWwg2apmyBPhwt91B7BXZ92OtOwUC66zxGSoveQgUbzUQy3KuNajg/zQF Ql2Mo8BFge8ZtCPzg9CFKHYc274Af6Y/HivhABPz9ZIW5E/vrNDnc9jQTi/WHccopKgOQ5wrREAa eq+UMIeycfMOu/6/xhesXQs/EHmyGWEbJiuU0iVPrOF1X1zEA48/2GX5vQV/w7134Yemcqj7awFr xjYIEA0lbCjFMQHfBES11kekE9piZpYXoyUzp1v21kJtFPfQ+F82WD/6BBn8F0jY0lHKctSgbhTl 2qKUJbB4Ba4+8hBgLzgDHdpZsP15jqTh2iBBHO8tCM4QVJwy2qlfqf9VOd7Kq0PitLwg7FWnyGb2 0MSXCxOc0SMjBdH62B8lbqf64iXLv7dcIaRyCHK9+rGTffVpz2v6scKKxvBkzWPd2TfRxFgahuoH qeH3ELmF/sipdkLHf0u+3ElKn5xGpWAho9q63Me2IEINFipnvkU/BHWmLFsCnVYfcWr5fWLVjEve g9Vvn2CjHxL+PnrEp9NfYixwX+87FnNiIgL7ffAl85Zhghw9QrU3vWZdQV8FaXR9QjIheTAAAuML gtIlQdaaILADwvEMXoNHtmk4cVccLdEB8vEJa1RDZ9/BdSd7nlmcjkzAXFjRKKhAshoYUMT1ryR3 kSlP/5w6DQjYJYe9BsCWtf3AOyWsbhF4nrzr3Tko7TFwXka4Rv0vx2SjGKyeiWy0pMLJ+ESu7E5Q eSkU7hQeXPv2nUvjOebbUa1V0GsLr40v1X1X8/G+6ArqEySG9a0R0= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: typ22@foxmail.com Date: Fri, 24 Nov 2023 14:03:40 +0800 X-OQ-MSGID: <20231124063913.4434-1-typ22@foxmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Received-SPF: pass client-ip=162.62.57.210; envelope-from=typ22@foxmail.com; helo=out162-62-57-210.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: tiantian * 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(-) base-commit: d20ece07dbb09382f361c8bbf0bcab9e83d8b73e 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