From patchwork Thu May 8 06:02:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42397 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 1892327BC4A; Thu, 8 May 2025 07:37:46 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 783C627BC49 for ; Thu, 8 May 2025 07:37:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCusX-0006ZS-8d; Thu, 08 May 2025 02:37: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 1uCusR-0006Yk-6d for guix-patches@gnu.org; Thu, 08 May 2025 02:37:03 -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 1uCusQ-0001iI-U5 for guix-patches@gnu.org; Thu, 08 May 2025 02:37:02 -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=0MLMMcxxWctW/jlInP2ZCILiRjJc3AJ1xuGwWzje7Pc=; b=Trxn3FuJGy5Q2pZZp4FtGCofddywtb/XDp1kL2tjUqZWMe+7f9h+n7ja+h7KWHVSYkQCWpU0xauQ8E69Be9yDEkxehz8O3ZNcqCd+O6ZgWCO3pzdgdfU3Xoy5lFANu7QDoy511wrNT4xGO4j2RuHOu2xVf5nQYmN+nhH2Qdyh9AxcMnCuJfkTXQcRnXK14hyab3pHJwUy3mKjywR6K/AgnProBF5X7dQJj0dVq9+wzl57jeCJyREAid0exVw9/aNL44d/SRkHUelbHeUOps6nZaXwoDElOVMNwyyDodmDEEqTunjGX4M3Vgqs+UMFm6jHCm3GT1liEwK20CbBOxGCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCusQ-0000lk-OL for guix-patches@gnu.org; Thu, 08 May 2025 02:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78308] [PATCH 3/9] gnu: bash: Define the SYS_BASHRC macro. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 06:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78308 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78308@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 78308-submit@debbugs.gnu.org id=B78308.17466861692733 (code B ref 78308); Thu, 08 May 2025 06:37:02 +0000 Received: (at 78308) by debbugs.gnu.org; 8 May 2025 06:36:09 +0000 Received: from localhost ([127.0.0.1]:52869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCurZ-0000hz-5q for submit@debbugs.gnu.org; Thu, 08 May 2025 02:36:09 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:61869) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uCurU-0000h2-Vz for 78308@debbugs.gnu.org; Thu, 08 May 2025 02:36:05 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-73972a54919so673936b3a.3 for <78308@debbugs.gnu.org>; Wed, 07 May 2025 23:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746686158; x=1747290958; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0MLMMcxxWctW/jlInP2ZCILiRjJc3AJ1xuGwWzje7Pc=; b=cJN6GoliJi+FCkPJVXhoBM/vFZh6iu/hicqs426cVML1UUg8v4G3xOl6IEzhwzNdWK 6tksmSbYebntvTds8Ic3JNHhnrpOzTnunwWskrkXKLlB5aUkfocHp1jc374FmDwSGsqq SlK9sImaBfqyNruH3CxXHHd28jG5Pw/qb/sKTN3n0MtGkGHvew1+/DLAA5fUDUZtseFz /ntVnHpo09eA6aCPCDnB5uzQS3b5+p25u4QM6wFBtPV/085aIYDZLxleY2aVMRXlwUVD 6mNCRSHDCFMP4ZwCDFL/xidsPzJoGF5wgmfMO2NakRXVirxUmnnoyEVI7G2jLQ1LcYUc fgQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746686158; x=1747290958; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0MLMMcxxWctW/jlInP2ZCILiRjJc3AJ1xuGwWzje7Pc=; b=nfTTR/cS5sk++EN81NEIYhI0tpcoCx79E4IZ9ul4D3+/Mhd2nxliTOj7DqX08rF1jo DO52I3bTcdzSVECnRMyy175ARKvjFwPWkiJlAgZfQBKmjzsy2S6ZvjEFpPi1vAisvWI3 4V7hoSYxNphI593v6AQOGqyvx6nDheVpfLBz8n0A7FD2VZYV1aUmbQBnHIMStzAssUIV 8KfU5/aY2a0nhgjo1qhaXMJXzIOZk6hso6JtuOb9ufhHT2+1dFM/K0oXBrr/fnqvZuHl a9FyOXyjKOSiTsgPTCBXGeBxcasL7RcHOlGMg5L4AnBKsdyMfVIqC5c+02zBXv2OQedN 3saw== X-Gm-Message-State: AOJu0YySAg1hPSQZeQcpWMRrSLmAkHwxuUx1YjO9l5vTcufHCRebOOdK TCeqjsV6PHonNkaDhHwQ8QRDeEgdGSzpHfmwwqIeH7kAo4nfWpcXl72aWg== X-Gm-Gg: ASbGncvwHupbqXqM/SsZFGOJvQMVuC51rqNGQ39UArxtSV5/qvIIi4i7Nd3oa3GcDuL yQ4MME0HqGy8hL7FG6BIyovj5HjtCF7O3z0cbOiFKiD5erG1LCr3DfJ6wnjLmQQBoPt6idQyihL 8HZiOrDD24yEzwPhTSiPjEJuPHr5N/m6vjz0CYORN+oyPJdnPglgobyAeC/3/ifhcJVcXRyEOkB Sb0nsieROm+uj2EuekScUCLlrRWIq5fXntuhIYngX0B4Hi3bu0WJxg4aDnlUoF8myuyajkBr5Ib BI2HvKOqKRJXJi2AKeEWsQFe/XSdf5QRTfCpLwUyoH0pae6doUIcE2Odi/1V X-Google-Smtp-Source: AGHT+IEhCWFlLV9ogBetNKiLWO5aAPUgHGelTgiUxooZ0PmNTjBulFWyUoj0AI924V/BEiBs0bd94g== X-Received: by 2002:a05:6a00:2791:b0:736:339b:8296 with SMTP id d2e1a72fcca58-740a9a589e4mr3326000b3a.18.1746686158495; Wed, 07 May 2025 23:35:58 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058dc45c7sm12452121b3a.71.2025.05.07.23.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 23:35:57 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 8 May 2025 15:02:19 +0900 Message-ID: <7e0d4c975862569cb0433e55e4ba9ebb7bdfc4d1.1746682206.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.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 This causes Bash to treat /etc/bashrc as a startup file, removing the need to source /etc/bashrc from ~/.bashrc. * gnu/packages/bash.scm (bash-fixed): New package, with added SYS_BASHRC define. (bash) [replacement]: Use it. * gnu/system/shadow.scm (%default-bashrc): Do not source /etc/bashrc, now done implicitly. Change-Id: I5b0afd7d81653ef19c482e5501efdf7e50ef37c0 --- gnu/packages/bash.scm | 20 ++++++++++++++++++++ gnu/system/shadow.scm | 3 --- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index c88f38f5376..bcd78d7d2a9 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2024 Oleg Pykhalov ;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 chris +;;; Copyright © 2025 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,6 +138,7 @@ (define-public bash (version "5.1")) (package (name "bash") + (replacement bash-fixed) (source (origin (method url-fetch) (uri (string-append @@ -254,6 +256,24 @@ (define-public bash (license license:gpl3+) (home-page "https://www.gnu.org/software/bash/")))) +(define bash-fixed + (package + (inherit bash) + (arguments + (substitute-keyword-arguments (package-arguments bash) + ((#:modules modules '%default-gnu-modules) + (append '((ice-9 receive) + (srfi srfi-1) + (srfi srfi-26)) + modules)) + ((#:configure-flags flags) + #~(receive (cppflags flags) + (partition (cut string-prefix? "CPPFLAGS" <>) + #$flags) + (cons (string-append (first cppflags) + " -DSYS_BASHRC='\"/etc/bashrc\"'") + flags))))))) + (define-public bash-minimal ;; A stripped-down Bash for non-interactive use. (package/inherit bash diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index d0f1b6b2b14..50ac102707e 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -164,9 +164,6 @@ (define %default-bashrc return fi -# Source the system-wide file. -[ -f /etc/bashrc ] && source /etc/bashrc - alias ls='ls -p --color=auto' alias ll='ls -l' alias grep='grep --color=auto'