From patchwork Mon May 19 00:29:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42738 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 41F1227BC4D; Mon, 19 May 2025 01:30:51 +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=-6.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_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 B8ABF27BC49 for ; Mon, 19 May 2025 01:30:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGoOQ-0003KR-1U; Sun, 18 May 2025 20:30:10 -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 1uGoON-0003JO-5r for guix-patches@gnu.org; Sun, 18 May 2025 20:30: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 1uGoOM-00013L-Sw for guix-patches@gnu.org; Sun, 18 May 2025 20:30: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=W6xpWnQinAL51xcGWLaiqQnKJM7Y9RLwRqV+A8ybzW4=; b=F6ICpf9AS5A9IV3KDRLfZXQh5kstvDwoiW5p3QUw46g3KHXaLAvR3ddcvveXMpbt7WTqSqhQvE5qCLtntMv3o/pHdQdI0CFWeVDv5qZdD/6OJfmiNlUrW9R6LXWHHa8F2Zue4f4akN7zfvgQH599nYGuXPk+X9Yjh7HUA12cKgZGFKIwPehw2MgcS7ar+BclDaeXjysfcTAeld03Q3RmGjCtkavNsekZov0RxVyYEeBeALX25qT/Lbt/8M3rVC1K1kmcULPGN0O50zzdqjmO6ZVkf2rnoFn0qop+OmZQkIAXYeHnpdLU5Z9aeORvIbBS+5feEM7OtecXuuRRhrXzVw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGoOK-0006m0-GA; Sun, 18 May 2025 20:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78308] [PATCH v3 03/10] gnu: bash: Define the SYS_BASHRC macro. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, rutherther@ditigal.xyz, lgcoelho@disroot.org, guix-patches@gnu.org Resent-Date: Mon, 19 May 2025 00:30:04 +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 , Maxim Cournoyer , Rutherther , Luis Guilherme Coelho X-Debbugs-Original-Xcc: Maxim Cournoyer , Rutherther , Luis Guilherme Coelho Received: via spool by 78308-submit@debbugs.gnu.org id=B78308.174761458625756 (code B ref 78308); Mon, 19 May 2025 00:30:04 +0000 Received: (at 78308) by debbugs.gnu.org; 19 May 2025 00:29:46 +0000 Received: from localhost ([127.0.0.1]:34020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGoO1-0006hL-DP for submit@debbugs.gnu.org; Sun, 18 May 2025 20:29:46 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:44530) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uGoNz-0006gr-6d for 78308@debbugs.gnu.org; Sun, 18 May 2025 20:29:43 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-742af84818cso1717903b3a.1 for <78308@debbugs.gnu.org>; Sun, 18 May 2025 17:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747614577; x=1748219377; 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=W6xpWnQinAL51xcGWLaiqQnKJM7Y9RLwRqV+A8ybzW4=; b=MOO1sNdIsHG/scQdTIOIA3xlae3eAA3LA78JpKsn29b2Qgzn69xPZCwnU0cNZnDPLh 9nGfhBH1Fx0e1om15knER1bij7MwN9v6Mj/mqmz+UKgiGVz7HrmFD7Sd3IBGfKS+b0Pz QUHJkr8RR+NCvGJODm/+SSTYs8otTlvB6P94XQUoWXoaCA+WTvWacIt1pzzE1U/m7M4g +H7M80FCOuMNmP8FjgfxHngdc5zmkeLj5Akq2H8i2RsXov7sneLGPAdy0BVeFvpRHJmJ 4ZAPhzbkBswLHpIsNblOEvIVSVrqHUwWN5GCU5Dup0RcTbsZtiN15d7JJ9g0PH0RFx/r A3Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747614577; x=1748219377; 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=W6xpWnQinAL51xcGWLaiqQnKJM7Y9RLwRqV+A8ybzW4=; b=M2VqPHhGLnESBdVpgU3tzACGwXFfBuimTozImTPTy4h9DBwfAmEah5V4mI+zk/dHOx Gxyr1zg9SNhe5fj89dSmkxBWBbN7Ql/cZy4OXT0eYLHReaRMJ0ar7U7rY37oXtvhZjrg FuHvDErgYAcauzCf16kNR0tsJCDSpNoEwGk+9VAisOG0TEYDL9Cv7CCgQClKORLG4FGB lZ0SH2znIaALGKWyfHW8YuMk6KMCZKb3b7WSgE+QCYMuwO0d/lzDDVXQswLyatz/GY27 qnvJ1Go1UevMKKiFJzDIjH+ddzDHWmi6PHnxFjek628Wi0UpICZVjL033AsU+Yn4Rl4a uYJg== X-Gm-Message-State: AOJu0Yx/DsKM5bJqFUZHSho5SVyGIhtciZtqaWWgxRqfyzGm1fjh9p/3 xVlfsbCDCfsTLI0dcNa1Z8JjhZTtb2DovDH3Lz6XAK/LVzXzlpFmNoykkRTyEQ== X-Gm-Gg: ASbGnctFjpRFYas0ffZxkj9HH9WdbM0MxJMrnK1M7Dehcen1FtR4+2hSiuLb+vEm9KI HCsn6Bsji3QZjqi+evZzQFOsaJZzCOAa6lNAGNkit66ploKc+mzdz1TO7dofQTJ46Ew1yHSxRn7 ZIvgQIt6Ne/nnCoMfu7e28jetcar8J/NvOWbkPzu1u4TRSkFDB2GiDsmyDASD1vKn5t5J41m8XS 5YhnR0z4ehvrG08RYSCSDHof9RXN5DCcyTby9dGdTt1xvxCe7NW2Bq22F4/Of6HGFzBS1jVk7X5 EfREZy+TPoQeb2yJ7fZ1gzwFskvPmcSLYQe3y+hKexEpkGz7SVxKffXqTLlzOTW3ommRpGQ= X-Google-Smtp-Source: AGHT+IEAA4HIdss5LmjM9rXK+7my0c2RkmwujokHFfDqibbg8q8azYSiNOytef94n9aCqeSf95qwFw== X-Received: by 2002:a05:6a00:3a20:b0:736:a6e0:e66d with SMTP id d2e1a72fcca58-742a97a6df2mr13223241b3a.6.1747614576727; Sun, 18 May 2025 17:29:36 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970c882sm5254027b3a.55.2025.05.18.17.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 17:29:36 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 19 May 2025 09:29:01 +0900 Message-ID: <94963f01fe3fca8180794bcd461f7a98e61c7470.1747614548.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 7258a57dc6a..b9a5a6134bc 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -165,9 +165,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'