From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mAteA0pGYGU4hgAAG6o9tA:P1 (envelope-from ) for ; Fri, 24 Nov 2023 07:44:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mAteA0pGYGU4hgAAG6o9tA (envelope-from ) for ; Fri, 24 Nov 2023 07:44:26 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1D055339BF for ; Fri, 24 Nov 2023 07:44:22 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foxmail.com header.s=s201512 header.b=iBfrkLAf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foxmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700808266; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=PRG+83T7LMyspjtY9Y0vyxPhp9VjRpuin1hc4/ZKXMg=; b=TbTXLvu93BU2eKKMEj1U3sheiP0xAJqD6TfezB25Zgs+rVMcucGTU6HDckAH5hnU32mCpV BaJj19TP6nLqErKo0s46zn457IXGlX0csRq7xex0xgC/AgLV5twX69SPiXNnsq8iKA+V0b HDK9zEbNgCuDdjr4E+wtosTW6tRyR1U44p+iBVwJaL9AMaiNmC5Pu9Mn6IfvMWEXXUwEVL +EtXnpPZYvoBGAiIBbzcq05qh+9+PZGYXnqDe0mA2gjvnj4GrPj9EAWnJiAQzu09JbZRMo FY/vgjJjns1iRd/+TvyswEw4HaImPOmfOCl/EAGOC+hzRl2D1akk0N5DUC0ypw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foxmail.com header.s=s201512 header.b=iBfrkLAf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foxmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1700808266; a=rsa-sha256; cv=none; b=n3F6EXlpwaIn9Wsn2h9xdhWiLWZQ5LCfIts8VU/xM6ZSGsg/ETJOQm0JQyOq5wO08STRRY EhNtMDR/X8ZRQAvFgZz56sr2ZW3VnyeDvsrDrj/DEtIBPpePyF4P4xf7MND1LJzfiSv08j z1xYjI5sywqN9O2jfw/s5Ugdmr+Qf5y3qnvF8ZBOLm7RP3UuMRLugrnG5o+k7abVP511Ju ApsXpDSYNj7wRKTLCTLbvYvIGqX4HZPTOCsMaANhL4YIkNst38PMvBuayOJW/KfGfQzMGC A0FIowSwVuoDBuSQZaVWWOUjj7p8kLSw4rxch6/hUVBfHV0dFxgHCMUsxeeuvg== 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.52 X-Spam-Score: -4.52 X-Migadu-Queue-Id: 1D055339BF X-Migadu-Scanner: mx10.migadu.com X-TUID: 0lSGq72Tb0E5 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(-) 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