From patchwork Tue Dec 27 21:26:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45606 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 2038B27BBEB; Tue, 27 Dec 2022 21:27:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9A00C27BBE9 for ; Tue, 27 Dec 2022 21:27:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAHTU-0001FT-Ik; Tue, 27 Dec 2022 16:27:04 -0500 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 1pAHTS-0001EL-OD for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAHTS-00040Z-Ff for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAHTS-0007tF-B9 for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60365] [PATCH 2/4] system: Define default 'PS1' in /etc/bashrc rather than ~/.bashrc. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60365@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 60365-submit@debbugs.gnu.org id=B60365.167217639930280 (code B ref 60365); Tue, 27 Dec 2022 21:27:02 +0000 Received: (at 60365) by debbugs.gnu.org; 27 Dec 2022 21:26:39 +0000 Received: from localhost ([127.0.0.1]:56605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHT4-0007sI-W2 for submit@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHSz-0007rd-Kg for 60365@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAHSu-0003x5-EH; Tue, 27 Dec 2022 16:26:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=T9FJTiQCJAUcBzfAWXqDxlNDP/o4zwVmF0cpNlhwJ8Q=; b=QklAT+fXUPixWfOagNMN yIWGT4EeaC5KYTlmJ4ynJ31FQEhL/3xOKTtWg/j87BWMDCnX2bkl5aQPWRmuuHBcxXXk39CJvdDkz JTxevY5K9AQjf5p+fqyez1at2OGKzMeAo4GlIu8N/r7tyTuQgq969qpNkGwf0XIRnf5ACO+bhqcTA 23J8bc7hQNNbpwhl6WydDBl7Gaf4apJImW23RiXAnVLXUFAKLliaNrWcwjfiNqg1J2PCTcjfnZ8nV l6C+Ie/5XAWb+V01fTDxiQdP49oA/1XS1uDtsa5Hc2el6EL8uk7JgBvaMkNdq9gcEaNmrVswxip0n DW8fBqjqcmahAQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAHSt-0007DL-Pf; Tue, 27 Dec 2022 16:26:27 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Dec 2022 22:26:16 +0100 Message-Id: <20221227212618.18063-2-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221227212618.18063-1-ludo@gnu.org> References: <20221227212618.18063-1-ludo@gnu.org> 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 Users can override 'PS1' in ~/.bashrc if they wish. Previously, on Guix Home, the "default" 'PS1' would be set in ~/.bashrc when 'home-bash-configuration-guix-defaults?' is true, preventing users from overriding it via the 'environment-variables' field of 'home-bash-extension'. * gnu/system/shadow.scm (%default-bashrc): Remove 'PS1' setting. * gnu/system.scm (operating-system-etc-service): Define PS1 in /etc/bashrc. --- gnu/system.scm | 3 +++ gnu/system/shadow.scm | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 62c8e0c2b6..d67f9a615b 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1047,6 +1047,9 @@ (define* (operating-system-etc-service os) (bashrc (plain-file "bashrc" "\ # Bash-specific initialization. +# Provide a default prompt. The user's ~/.bashrc can override it. +PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ ' + # The 'bash-completion' package. if [ -f /run/current-system/profile/etc/profile.d/bash_completion.sh ] then diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 4360a5ebd1..2e87928368 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -142,13 +142,6 @@ (define %default-bashrc # Source the system-wide file. [ -f /etc/bashrc ] && source /etc/bashrc -# Adjust the prompt depending on whether we're in 'guix environment'. -if [ -n \"$GUIX_ENVIRONMENT\" ] -then - PS1='\\u@\\h \\w [env]\\$ ' -else - PS1='\\u@\\h \\w\\$ ' -fi alias ls='ls -p --color=auto' alias ll='ls -l' alias grep='grep --color=auto'\n"))