From patchwork Thu Dec 30 08:39:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Hinsen X-Patchwork-Id: 35844 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 472DD27BBEA; Thu, 30 Dec 2021 08:40:17 +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,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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 0CD8127BBE9 for ; Thu, 30 Dec 2021 08:40:17 +0000 (GMT) Received: from localhost ([::1]:33876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2qyu-0000pW-7I for patchwork@mira.cbaines.net; Thu, 30 Dec 2021 03:40:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2qyg-0000p8-Ue for guix-patches@gnu.org; Thu, 30 Dec 2021 03:40:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2qyg-00012f-Hb for guix-patches@gnu.org; Thu, 30 Dec 2021 03:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2qyg-0006ri-7n for guix-patches@gnu.org; Thu, 30 Dec 2021 03:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52891] [PATCH] guix-install.sh: Run guix.sh script in /etc/profile.d last. Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Dec 2021 08:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52891 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52891@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164085358826361 (code B ref -1); Thu, 30 Dec 2021 08:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2021 08:39:48 +0000 Received: from localhost ([127.0.0.1]:51360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2qyN-0006r0-6E for submit@debbugs.gnu.org; Thu, 30 Dec 2021 03:39:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:35518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2qyL-0006qq-D8 for submit@debbugs.gnu.org; Thu, 30 Dec 2021 03:39:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2qyJ-0000nd-3i for guix-patches@gnu.org; Thu, 30 Dec 2021 03:39:41 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:60635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2qyH-000103-61 for guix-patches@gnu.org; Thu, 30 Dec 2021 03:39:38 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B1D9F5C0222; Thu, 30 Dec 2021 03:39:34 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 30 Dec 2021 03:39:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= from:to:subject:date:message-id:mime-version:content-type; s= fm2; bh=NAGpWcwLpO5CHz6QShPB1y3DBG90c9ZhmfQ+6bFh/3o=; b=WH6aTcga OA/uvShl10/sFUqfH2eJ228VrlmUwuqb3WccZ7EYmt7kYHsNxImG9gNGElVakUmw OJrhzkKA8NLagomRp9olQxQUdijrfZerR49w3mDD6qz35tnbfT9YsyrdpELq8noM 6j8Txflli2LLPKgXprU3rr02yD62i8FL/C1PxHg9NQ4sg+mMkHQkhMMWJh6lbWVg 4M7MMz76YS/L/fR1yiKVKW0rewyPW/f8oi27RyhNQSTs6tuzSJh60HvGuTxvTJY2 KxSlahyKSisZGMkt1cprKO2u4JGcHpQYiATfNviBkRzrObm5iwt59sM38csVTnc5 VUiCD6ugVJMtfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=NAGpWcwLpO5CHz6QShPB1y3DBG90c 9ZhmfQ+6bFh/3o=; b=ktE763NQwN2hLqJedfye5EVzvi9LE3KUb1+SiT4yuPX3c oa/AiWHB9IfSdtSkxsR0tatYFukWij4g0++06Wu3KeEEboAFuuPs5ka32OhSxQCV RHqf8prly6vrxFjYHgvORZk0jeKgJ+v2n8wGHXq1qWBlhzurEPsNPLh65QCoRmCj 9fWgTQnI9ALI0x0r8n+dwKJUHdKUnsop2UW5HWCxA2rBh/hRHcWKF8L7ZEbYG1mP +zqrZKFUHSqD012QMqor3a64zEuuBF+5j1UNxNpkoNoe575PO5hJLocJNHvkai3o u1G6KAAsoKaC2uayfKzKttJ4HPgNmjT0toaBYvlOw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddvvddguddvhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkfggtgesthdtredttd dttdenucfhrhhomhepmfhonhhrrgguucfjihhnshgvnhcuoehkohhnrhgrugdrhhhinhhs vghnsehfrghsthhmrghilhdrnhgvtheqnecuggftrfgrthhtvghrnhepveefveeutdeitd ettefggeehvdduieelkefgheekheduteevheegueetueevjeehnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepkhhonhhrrggurdhhihhnshgvnh esfhgrshhtmhgrihhlrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 Dec 2021 03:39:33 -0500 (EST) From: Konrad Hinsen Date: Thu, 30 Dec 2021 09:39:31 +0100 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.29; envelope-from=konrad.hinsen@fastmail.net; helo=out5-smtp.messagingengine.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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" X-getmail-retrieved-from-mailbox: Patches * etc/guix-install.sh: Rename /etc/profile.d/guix.sh to zzz-guix.sh. This script refers to environment variables set by the host distribution. They may be set in other scripts in /etc/profile.d, which must therefore be run first. Example: in Ubuntu 20.04, XDG_DATA_DIRS is set in /etc/profile.d/xdg_dirs_desktop_session.sh --- 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 cd1a1c34c1..00a9fc5377 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -503,7 +503,7 @@ sys_create_init_profile() { # Define for better desktop integration # This will not take effect until the next shell or desktop session! [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case - cat <<"EOF" > /etc/profile.d/guix.sh + cat <<"EOF" > /etc/profile.d/zzz-guix.sh # _GUIX_PROFILE: `guix pull` profile _GUIX_PROFILE="$HOME/.config/guix/current" export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"