From patchwork Mon May 24 15:37:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 29560 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 7214F27BC81; Mon, 24 May 2021 16:38:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2FA7027BC78 for ; Mon, 24 May 2021 16:38:33 +0100 (BST) Received: from localhost ([::1]:42100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llCf2-00015h-9n for patchwork@mira.cbaines.net; Mon, 24 May 2021 11:38:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llCeY-0000HU-0S for guix-patches@gnu.org; Mon, 24 May 2021 11:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llCeX-0005j1-Pi for guix-patches@gnu.org; Mon, 24 May 2021 11:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llCeX-0006gL-Ng for guix-patches@gnu.org; Mon, 24 May 2021 11:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48624] [PATCH] guix-install.sh: No longer export GUIX_PROFILE. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48624 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48624@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162187063325625 (code B ref -1); Mon, 24 May 2021 15:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 May 2021 15:37:13 +0000 Received: from localhost ([127.0.0.1]:43692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llCdl-0006fF-DF for submit@debbugs.gnu.org; Mon, 24 May 2021 11:37:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:56650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llCdj-0006f7-S5 for submit@debbugs.gnu.org; Mon, 24 May 2021 11:37:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llCdj-0000DW-LD for guix-patches@gnu.org; Mon, 24 May 2021 11:37:11 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:34568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llCdh-0005LZ-J5 for guix-patches@gnu.org; Mon, 24 May 2021 11:37:11 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FphCj45ssz1s2CR for ; Mon, 24 May 2021 17:37:05 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FphCj3JWJz1qsZl for ; Mon, 24 May 2021 17:37:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id zTdIjroF-vAj for ; Mon, 24 May 2021 17:37:04 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-48-68.dynamic.mnet-online.de [188.174.48.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Mon, 24 May 2021 17:37:04 +0200 (CEST) Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id AEA776017A; Mon, 24 May 2021 17:42:14 +0200 (CEST) From: Hartmut Goebel Date: Mon, 24 May 2021 17:37:02 +0200 Message-Id: <6251b4d6fd935c6546273edfbf68fdf0b07860a2.1621870588.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.4 MIME-Version: 1.0 Received-SPF: none client-ip=2001:a60:0:28:0:1:25:1; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=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" X-getmail-retrieved-from-mailbox: Patches If GUIX_PROFILE is exported here, any subsequent "source /some/other/profile/etc/profile" will set variables pointing to "$HOME/.guix-profile" instead of pointing to the sourced profile. * etc/guix-install.sh (sys_create_init_profile): No longer export GUIX_PROFILE. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 6a799fa823..8ecadea97d 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -499,7 +499,7 @@ export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" GUIX_PROFILE="$HOME/.guix-profile" [ -L $GUIX_PROFILE ] || return GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" -export GUIX_PROFILE GUIX_LOCPATH +export GUIX_LOCPATH [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"