From patchwork Fri Apr 5 17:09:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62732 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 EFB3527BBEA; Fri, 5 Apr 2024 18:10:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 611FB27BBE2 for ; Fri, 5 Apr 2024 18:10:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsn4h-0007du-TJ; Fri, 05 Apr 2024 13:10:00 -0400 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 1rsn4e-0007d9-DX for guix-patches@gnu.org; Fri, 05 Apr 2024 13:09:56 -0400 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 1rsn4e-0000Jb-4O for guix-patches@gnu.org; Fri, 05 Apr 2024 13:09:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsn4j-0007xz-Pa for guix-patches@gnu.org; Fri, 05 Apr 2024 13:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70218] [PATCH 2/2] guix-install.sh: Fix setting GUIX_LOCPATH. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Apr 2024 17:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70218@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70218-submit@debbugs.gnu.org id=B70218.171233699530579 (code B ref 70218); Fri, 05 Apr 2024 17:10:01 +0000 Received: (at 70218) by debbugs.gnu.org; 5 Apr 2024 17:09:55 +0000 Received: from localhost ([127.0.0.1]:37439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsn4b-0007x5-Eg for submit@debbugs.gnu.org; Fri, 05 Apr 2024 13:09:55 -0400 Received: from wolfsden.cz ([37.205.8.62]:52350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rsn4W-0007wA-UP for 70218@debbugs.gnu.org; Fri, 05 Apr 2024 13:09:52 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9F9F22A7B8B; Fri, 5 Apr 2024 17:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1712336982; bh=Kfc+AFNKeHmcnvSzJsh5uxPNpq8jGkYlGi6eE48JzTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D0L2iigZwzUnvh2ypt7HEEt+HNfm4BJPhsCm4GcG2i7ydKGIm4rwALDT1/28Z5IOU s7ReyIXdd8fhGoRT3RzNs8LeXW24rOWqvhjcuEKfDoUq5ML6PBvsmQD4Z6buToWbvw MZ7hXreNwnuF0wIx27qmGy9RU9IVIayTERhOnEMOxkOANcu9uTgc3RqeSyvYuViS5r 0EUgiJEi0MHmirzX8BhcpBuD2lDo2KjIpB9Lac9961oyM00bD/ep4wRt8uhfPczArT 607fWezZOqDicw6cJEJpUIvEPxmA2C94VBISOiGmCDBmnffLojXcNNQhIKKZqx2s5I aFHx4iOXm4K/72yXpcO3wnpsvNhltzGvirBWPk5s6nNIrF1dE0gU+GaUfr4MerqIgb llB7hmUDmY/rBc3Gwffb4ev8jQWsACaT+JQkIIvoQ/s1AwiWVvjwGmP/uH1N3xLfPY zRiV7sD9xRQhhA9ISEehJt3IQcrxmu+dlE9OZ8gQgfgXx2hXg9oIcJLCaCvvfNbGOX 41HjY7lCesLfkbNYxvH9S1KDzvrmz2UJW613PY7/c7CwKLLvrOkqq7f2Un5MTID2kg nHbToJbDa/+DyVKG7O/j5cmW7MRpSyzlaMVVbK94TAWN7yZbiBr0wcqgWmQeuTsj5c POqUsymSZDbAV9P5x17hN/w0= Received: from localhost (unknown [193.32.127.156]) by wolfsden.cz (Postfix) with ESMTPSA id 4C1CC2A42EB; Fri, 5 Apr 2024 17:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1712336982; bh=Kfc+AFNKeHmcnvSzJsh5uxPNpq8jGkYlGi6eE48JzTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D0L2iigZwzUnvh2ypt7HEEt+HNfm4BJPhsCm4GcG2i7ydKGIm4rwALDT1/28Z5IOU s7ReyIXdd8fhGoRT3RzNs8LeXW24rOWqvhjcuEKfDoUq5ML6PBvsmQD4Z6buToWbvw MZ7hXreNwnuF0wIx27qmGy9RU9IVIayTERhOnEMOxkOANcu9uTgc3RqeSyvYuViS5r 0EUgiJEi0MHmirzX8BhcpBuD2lDo2KjIpB9Lac9961oyM00bD/ep4wRt8uhfPczArT 607fWezZOqDicw6cJEJpUIvEPxmA2C94VBISOiGmCDBmnffLojXcNNQhIKKZqx2s5I aFHx4iOXm4K/72yXpcO3wnpsvNhltzGvirBWPk5s6nNIrF1dE0gU+GaUfr4MerqIgb llB7hmUDmY/rBc3Gwffb4ev8jQWsACaT+JQkIIvoQ/s1AwiWVvjwGmP/uH1N3xLfPY zRiV7sD9xRQhhA9ISEehJt3IQcrxmu+dlE9OZ8gQgfgXx2hXg9oIcJLCaCvvfNbGOX 41HjY7lCesLfkbNYxvH9S1KDzvrmz2UJW613PY7/c7CwKLLvrOkqq7f2Un5MTID2kg nHbToJbDa/+DyVKG7O/j5cmW7MRpSyzlaMVVbK94TAWN7yZbiBr0wcqgWmQeuTsj5c POqUsymSZDbAV9P5x17hN/w0= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 5 Apr 2024 19:09:37 +0200 Message-ID: <6b147273d133a1dbdcc2141be4fec18ffe1112fa.1712336516.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 After installing Guix home on my new foreign system, the locale did not work and GDM did not even let me to log in. After some digging around using tty3 and tty4, I realized the GUIX_LOCPATH is not being set properly. I had nothing installed in the ~/.guix-profile (the symlink did not even exist) and I had glibc-locales installed in ~/.guix-home, yet GUIX_LOCPATH contained "$HOME/.guix-profile/lib/locale:". I believe when the code was modified from the original "home or profile" to the current "home and profile" the || was used by accident instead of &&. I also remove the trailing :, since it is taken care of by the ${...:+:}. * etc/guix-install.sh (sys_create_init_profile): Change-Id: I8a3287fe809af58aee2edc924154eecf91fa1eb8 --- 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 7876afa196..e7a8ca6476 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -549,13 +549,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