From patchwork Tue Dec 27 21:26:17 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: 45607 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 96CAD27BBEB; Tue, 27 Dec 2022 21:27:33 +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 D290527BBE9 for ; Tue, 27 Dec 2022 21:27:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAHTU-0001FY-S0; 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 1pAHTT-0001EU-6P for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:03 -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-00040j-U2 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-0007tM-MQ for guix-patches@gnu.org; Tue, 27 Dec 2022 16:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60365] [PATCH 3/4] environment: Simplify 'PS1' suggestion on '--check'. 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.167217640030287 (code B ref 60365); Tue, 27 Dec 2022 21:27:02 +0000 Received: (at 60365) by debbugs.gnu.org; 27 Dec 2022 21:26:40 +0000 Received: from localhost ([127.0.0.1]:56607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHT5-0007sL-D3 for submit@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAHT0-0007re-0C for 60365@debbugs.gnu.org; Tue, 27 Dec 2022 16:26:34 -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-0003xL-Pr; 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=8Uc6z+g0WAoQdqJjLWT0uDgMYuY++02kgtRDtvfWg9A=; b=HZbdTSiBN8NDZajBzSCd d5hqywRvA/SGh8kXgL3T29lzWcPbyW2VH7OHF7+HSt2uxSe7i1CW3XKiAr3pyzlVOSKCdFPaT+xas yw4PibDpdiZHG0mTYKrLTAuwfoZeCxqhGTMxhGluRLuJtFyfjYqIRpVjQ/TPirFKwkfDe5uMfHeNa dUj90u0GgHk/NQzwiimKsfvRG0PsV4qMG09Htih9m/DTVLLg7Co7lLVAyA+SXllU6Lfixdn/UpPoH mlpW1KB1h44M5/Mh2xAG+s1/g2UuOZB4rZrehFNeNQDl2MORcQ5YbqfRkHW2FZbkgXSueOAZFaYC4 loFYpbOZ+evLpA==; 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 1pAHSu-0007DL-Cs; Tue, 27 Dec 2022 16:26:28 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Dec 2022 22:26:17 +0100 Message-Id: <20221227212618.18063-3-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 * guix/scripts/environment.scm (validate-child-shell-environment): In 'PS1' suggestion, remove 'export' and avoid 'if'. --- guix/scripts/environment.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index ab11b35335..bdbfa03fcf 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -610,10 +610,7 @@ (define-syntax-rule (warn exp ...) @file{~/.bashrc}: @example -if [ -n \"$GUIX_ENVIRONMENT\" ] -then - export PS1=\"\\u@@\\h \\w [env]\\$ \" -fi +PS1='\\u@@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ ' @end example "))))))