From patchwork Sun Aug 27 19:59:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: GB X-Patchwork-Id: 16302 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 8F60827BBE9; Mon, 28 Aug 2023 01:46:09 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS 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 EAB2C27BBE2 for ; Mon, 28 Aug 2023 01:46:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaQO7-0006eI-Dd; Sun, 27 Aug 2023 20:45:52 -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 1qaPBh-0000oD-Bb for guix-patches@gnu.org; Sun, 27 Aug 2023 19:28:57 -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 1qaPBh-0003T1-3o for guix-patches@gnu.org; Sun, 27 Aug 2023 19:28:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qaPBn-00030x-47 for guix-patches@gnu.org; Sun, 27 Aug 2023 19:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65573] [PATCH] Make bash source /etc/bashrc Resent-From: GB Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 23:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65573@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169317893711560 (code B ref -1); Sun, 27 Aug 2023 23:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Aug 2023 23:28:57 +0000 Received: from localhost ([127.0.0.1]:46419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaPBg-00030I-IU for submit@debbugs.gnu.org; Sun, 27 Aug 2023 19:28:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:43574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaLvQ-00054O-EA for submit@debbugs.gnu.org; Sun, 27 Aug 2023 15:59:59 -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 1qaLvC-0001kK-G1 for guix-patches@gnu.org; Sun, 27 Aug 2023 15:59:42 -0400 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qaLvA-0003fq-5j for guix-patches@gnu.org; Sun, 27 Aug 2023 15:59:42 -0400 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b9c907bc68so37545061fa.2 for ; Sun, 27 Aug 2023 12:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693166378; x=1693771178; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=2sSL3uoKE120cAHQNp3THRRjHg48UHUUpGplPel2Uus=; b=WH0HIwW9Rb3nS9EXxfLB0zUdTbp/SwzFUjQv0gsbz1STORAzW2JbbXXKj0WvxhFQ18 MJ+I90bl3NpKaKqYgfh3ReBQVByPWr5AQqRR7zzlY8gFcCHSFUkqMzdQhKPT7mGnHKwY yz4vysd3f0LuHQKYZyF2YP757mXO43o5ibeV6Q6SyMfGMHu0/rfiOPwACrs6sjySwyCf Ze/WRvxCsh9HqP3dPkTi/EOqGnQ2yBTtWjzt7iUvUcxcY3PC6ilX5Sr649miWr8+aRZd fCrYhnAsWQOF04f7bEQD979uWDD9tOAAUPweOFtxqXWhT9aL9b5LzeL/8uk/tRBTsYpK E6YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693166378; x=1693771178; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2sSL3uoKE120cAHQNp3THRRjHg48UHUUpGplPel2Uus=; b=OJtLHTT2IwpjCwQJonjnC7jXieYU+wjD55+cnIXwJYpg8++EQzLS3zIRyg5rujcwlO 7uOOYRtLWyB+pmHXvja3Pv0LROhQcxBvhZseSsRoEybKfqCTxNMKe9luHS/HI1sBE1kj Kc94+VnMRAvkpZLpJBbndS+zb6wFipoCUtVISH4mimx+mARgPOmLOry5g4ANJZu9UMq1 QFzIlyJ9jnhS5emcsNc8yTNlKQi5V5oi48d0BvgxVfAkijfPdxzyn7bwyffOKuU8+HzJ uamqhiT599Nc0+NB+9a98b2ndKkA72mrh6wCX+3MaqByhNdl+KQ86gQdjyxYndg9yXPN Mhqg== X-Gm-Message-State: AOJu0YxEOM3aKo9RXxrdiYpV9ivyigWAHLgeZoEYW9Ksilm4MDglc42F 6BOQXvFCv/NOKVY4bW3ITjLIFgsLIkERB/N7q2rLCVWaXX4rCw== X-Google-Smtp-Source: AGHT+IGdz2NV6s5pv5E0uwW8la7SdyhwQeWwg1Nvb3afsq2Waq/DxZtgNlGGS9/EnlSVj6PEquRLptnm/g5/WYkKdg4= X-Received: by 2002:a2e:7213:0:b0:2bc:cdfa:3d82 with SMTP id n19-20020a2e7213000000b002bccdfa3d82mr12471775ljc.38.1693166377833; Sun, 27 Aug 2023 12:59:37 -0700 (PDT) MIME-Version: 1.0 From: GB Date: Sun, 27 Aug 2023 22:59:26 +0300 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=g.bickovich@gmail.com; helo=mail-lj1-x22a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 27 Aug 2023 19:28:50 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 27 Aug 2023 20:45:44 -0400 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 At the moment, login shells source /etc/bashrc properly, while non-login shells don't, which makes bash-completion not work unless you source the file manually. From bc4a68e73c0f281ec45e7e94e734f407793c254c Mon Sep 17 00:00:00 2001 From: "German Bichkovich" Date: Sun, 27 Aug 2023 17:04:13 +0300 Subject: [PATCH] Patch bash to use /etc/bashrc --- gnu/packages/bash.scm | 5 +++-- gnu/packages/patches/bash-use-system-bashrc.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/bash-use-system-bashrc.patch diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index bb3359d5d1..22a57dd09b 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -140,8 +140,9 @@ (define-public bash (base32 "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc")) (patch-flags '("-p0")) - (patches (cons (search-patch "bash-linux-pgrp-pipe.patch") - %patch-series-5.1)))) + (patches (cons* (search-patch "bash-linux-pgrp-pipe.patch") + (search-patch "bash-use-system-bashrc.patch") + %patch-series-5.1)))) (version (string-append version "." (number->string (length %patch-series-5.1)))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/bash-use-system-bashrc.patch b/gnu/packages/patches/bash-use-system-bashrc.patch new file mode 100644 index 0000000000..df06d1a311 --- /dev/null +++ b/gnu/packages/patches/bash-use-system-bashrc.patch @@ -0,0 +1,14 @@ +Source /etc/bashrc by default. Otherwise, default login shell sources +bash completion, while non-login shells don't. + +--- config-top.h 2020-11-16 17:34:26.000000000 +0200 ++++ config-top.h 2023-08-27 14:14:41.404569202 +0300 +@@ -91,7 +91,7 @@ + #define DEFAULT_BASHRC "~/.bashrc" + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bashrc" + + /* System-wide .bash_logout for login shells. */ + /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ -- 2.41.0