From patchwork Sat Mar 15 13:24:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40202 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 CB5E827BBE2; Sat, 15 Mar 2025 13:26:22 +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=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 330A627BBE9 for ; Sat, 15 Mar 2025 13:26:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttRWj-0008Ht-Aj; Sat, 15 Mar 2025 09:26:09 -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 1ttRWh-0008H7-04 for guix-patches@gnu.org; Sat, 15 Mar 2025 09:26:07 -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 1ttRWg-0005Zn-7I; Sat, 15 Mar 2025 09:26:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ZqFFpKD5aV3/DtOyLAALRvGafOsNTsr4dymKFRwJQRA=; b=WtA5ALFPA9n3hGw0UOuN7/pkQt9XVaOeyQ0LMWWtJBRp2No5gPwJxKBb67OsifJ4thiXMZem7W5ohXa2Fu981TKRvciKlziY7Rb2pWOBAi+U2EJKUoSfNCxqh/Hdp6uvTQBqWT1XXz7KTZB9UprZ88whqZWQImtk49q47dL9vBzTfrL0S/A9AnzazO2rjoo2z+Rv1/ihzFn+RJODwvlaB0r+vva9L0QRuO6h/g16QnCiXRIHWOIpAF1AlNgNCGUXltW8BJ1Jtboah5yHdliFF2odqY9RCeFsBk6+ioDihZkqDD1EV7bEPuWok9LgnXBCOKROf5m79sj27dqA/if+HA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttRWc-0002Si-Ir; Sat, 15 Mar 2025 09:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77035] [PATCH 2/2] home: setup-environment: Avoid prepending duplicated PATH. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Sat, 15 Mar 2025 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77035@debbugs.gnu.org Cc: Hilton Chain , Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour X-Debbugs-Original-Xcc: Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour Received: via spool by 77035-submit@debbugs.gnu.org id=B77035.17420451169239 (code B ref 77035); Sat, 15 Mar 2025 13:26:02 +0000 Received: (at 77035) by debbugs.gnu.org; 15 Mar 2025 13:25:16 +0000 Received: from localhost ([127.0.0.1]:39869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttRVr-0002Nk-T5 for submit@debbugs.gnu.org; Sat, 15 Mar 2025 09:25:16 -0400 Received: from mx.boiledscript.com ([88.99.243.112]:57098) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttRVk-0002Gf-OP for 77035@debbugs.gnu.org; Sat, 15 Mar 2025 09:25:11 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742045107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZqFFpKD5aV3/DtOyLAALRvGafOsNTsr4dymKFRwJQRA=; b=UKCBFSEcJzeh+NwNOH/4Z2cVHrnUdrtNH22xlJMEpabwDMlMJ41ERmagzfXnyCRsX3bjDG yKnbnxYsc4E0/Gel5LQV6UD6HaM4BBYYfvmpju03yp0DptZ1a7lECyOSMYpNmxxppmNacy E91Pd1Uk2uI5xS32NkHSEoDYubKUV0yraG1hHE79vYjk1dE7yYXjujc3rp2hXrppM8X7ae jTgJ6jRbWvRg9GD095s9Dt59Glv+3U+KcyccLBCxLcO2EgCNJilntxBAkKzUyTaOZbk77J XRaVSQNMw2wfYxrdgQovBuCcO64qtPQz0dpC5GBfkex3eRZB/wO0e2uLXDHxFQ== Date: Sat, 15 Mar 2025 21:24:46 +0800 Message-ID: <2805fcddfaf4a65cc988e001b7534bd7c23810cd.1742043963.git.hako@ultrarare.space> 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 This makes best effort to order /run/privileged/bin first. * gnu/home/services.scm (environment-variables->setup-environment-script): Avoid prepending duplicated PATH. Change-Id: I580fbbf4786b56b903c1a4d6eb5fa92a70e331b4 --- gnu/home/services.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 85a43f80ca..9855e26d97 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -278,9 +278,21 @@ (define (environment-variables->setup-environment-script vars) # NOTE: Set HOME_ENVIRONMENT before sourcing (home-shell-profile-service-type ensures # ~/.profile does) GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\" + +# Check if PATH for home profile was already set by /etc/profile. +case $PATH in + *$GUIX_PROFILE/bin*) OLD_PATH=$PATH ;; +esac + PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\" [ -f $PROFILE_FILE ] && . $PROFILE_FILE +# Don't modify PATH if it was already set for home profile. +# This ensures /run/privileged/bin to be ordered first. +if [ -n \"$OLD_PATH\" ]; then + export PATH=$OLD_PATH +fi + case $GUIX_LOCPATH in *$GUIX_PROFILE/lib/locale*) ;; *) export GUIX_LOCPATH=$GUIX_PROFILE/lib/locale:$GUIX_LOCPATH ;; @@ -307,7 +319,7 @@ (define (environment-variables->setup-environment-script vars) esac # Keep the shell environment clean. -unset GUIX_PROFILE PROFILE_FILE +unset OLD_PATH GUIX_PROFILE PROFILE_FILE " port) (display