From patchwork Fri Jan 13 10:09:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 46081 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 EAD0A27BBEB; Fri, 13 Jan 2023 10:23:23 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 B2E4227BBE9 for ; Fri, 13 Jan 2023 10:23:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHDF-0000iU-4x; Fri, 13 Jan 2023 05:23:05 -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 1pGHDC-0000gh-Pj for guix-patches@gnu.org; Fri, 13 Jan 2023 05:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHDC-0006CS-DB for guix-patches@gnu.org; Fri, 13 Jan 2023 05:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHDC-0006gs-7F for guix-patches@gnu.org; Fri, 13 Jan 2023 05:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60778] [PATCH] guix-install.sh: Source both profiles, default user's and home. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60778@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167360532525623 (code B ref -1); Fri, 13 Jan 2023 10:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 10:22:05 +0000 Received: from localhost ([127.0.0.1]:49640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHCH-0006fB-4D for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:22:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:42294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHCF-0006eg-2V for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:22:03 -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 1pGHC4-0008WU-Mt for guix-patches@gnu.org; Fri, 13 Jan 2023 05:21:52 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGHC1-0005uY-Ou for guix-patches@gnu.org; Fri, 13 Jan 2023 05:21:51 -0500 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id B6670FF810 for ; Fri, 13 Jan 2023 10:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1673605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=MjGEhdkUdZueb7+sK3QyH8EBPBXZ+GUQxTyBzu+/mLQ=; b=f61ozkARHKtodT4swGLmKpqy3lUoI98mZD1fLgQoBzQQRMli0Rns9sNGkwQTmWTYvzyndh rYcnsv1sdFFMii8mphn1H/gf71cVbvnfIEnCjoM3vpmzkwD4W++UKa+n/w4q0b45kVkXh9 +dk0WTqvnK/F7YhMJJnqq/bv7MertYKntZDf2MgZV0jfYSo2vQeVt+zkZFVNZjAKF7zheN wh/dyseQQGIE3kp52BCuQ5+2N0vnnvtMwWfgihvG2uuPg/0QF/MF1gnqdLDVkgJiy5UcYI PTh4HQsycN7K611iRmQo1VhcVFsCpx8+/D8K5C5WwNyVBPg/moG63o0Wx5jNmg== From: Andrew Tropin Date: Fri, 13 Jan 2023 14:09:02 +0400 Message-ID: <87pmbi20qy.fsf@trop.in> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.199; envelope-from=andrew@trop.in; helo=relay9-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 * 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(-) 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 # Copyright © 2021, 2022 Maxim Cournoyer # Copyright © 2022 Prafulla Giri +# Copyright © 2023 Andrew Tropin # # 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 }