GNU bug report logs - #54356
[PATCH] home: services: Fix bash aliases without guix-defaults.

Previous Next

Package: guix-patches;

Reported by: angry rectangle <angryrectangle <at> cock.li>

Date: Sat, 12 Mar 2022 21:06:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#54356: closed ([PATCH] home: services: Fix bash aliases
 without guix-defaults.)
Date: Fri, 18 Mar 2022 14:03:01 +0000
[Message part 1 (text/plain, inline)]
Your message dated Fri, 18 Mar 2022 15:02:15 +0100
with message-id <874k3vqryw.fsf_-_ <at> gnu.org>
and subject line Re: bug#54356: [PATCH] home: services: Fix bash aliases without guix-defaults.
has caused the debbugs.gnu.org bug report #54356,
regarding [PATCH] home: services: Fix bash aliases without guix-defaults.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
54356: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54356
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: angry rectangle <angryrectangle <at> cock.li>
To: guix-patches <at> gnu.org
Subject: [PATCH] home: services: Fix bash aliases without guix-defaults.
Date: Sat, 12 Mar 2022 15:53:31 -0500
[Message part 3 (text/plain, inline)]
Because of a typo, aliases aren't included if guix-defaults? is #f.

This patch also fixes an inaccuracy in the documentation about placement of defaults.
They're actually put at the top, after aliases. Which is good considering it has the "exit if non-interactive" statement.
[0001-home-services-Fix-bash-aliases-without-guix-defaults.patch (text/x-patch, inline)]
From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001
From: angryrectangle <angryrectangle <at> cock.li>
Date: Sat, 12 Mar 2022 15:28:15 -0500
Subject: [PATCH] home: services: Fix bash aliases without guix-defaults.

* gnu/home/services/shells.scm: Fix bash aliases not being added if
  guix-defaults? was #f. Also fix inaccuracy in documentation about placement
  of defaults.
---
 gnu/home/services/shells.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index ca7f4ac0ad..9a79db484a 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -324,7 +324,7 @@ (define-configuration home-bash-configuration
   (guix-defaults?
    (boolean #t)
    "Add sane defaults like reading @file{/etc/bashrc} and coloring the output of
-@command{ls} to the end of the @file{.bashrc} file.")
+@command{ls} to the top of the @file{.bashrc} file.")
   (environment-variables
    (alist '())
    "Association list of environment variables to set for the Bash session.  The
@@ -448,7 +448,7 @@ (define (add-bash-configuration config)
               'bashrc
               (if (home-bash-configuration-guix-defaults? config)
                   (list (serialize-field 'aliases) guix-bashrc)
-                  (list (serialize-field 'alises))))
+                  (list (serialize-field 'aliases))))
              (file-if-not-empty 'bash-logout)))))
 
 (define (add-bash-packages config)
-- 
2.34.0

[Message part 5 (message/rfc822, inline)]
From: Ludovic Courtès <ludo <at> gnu.org>
To: angry rectangle <angryrectangle <at> cock.li>
Cc: 54356-done <at> debbugs.gnu.org
Subject: Re: bug#54356: [PATCH] home: services: Fix bash aliases without
 guix-defaults.
Date: Fri, 18 Mar 2022 15:02:15 +0100
Hi,

angry rectangle <angryrectangle <at> cock.li> skribis:

>>From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001
> From: angryrectangle <angryrectangle <at> cock.li>
> Date: Sat, 12 Mar 2022 15:28:15 -0500
> Subject: [PATCH] home: services: Fix bash aliases without guix-defaults.
>
> * gnu/home/services/shells.scm: Fix bash aliases not being added if
>   guix-defaults? was #f. Also fix inaccuracy in documentation about placement
>   of defaults.

Good catch!  I applied it and fixed the same string in doc/guix.texi.

Thanks,
Ludo’.


This bug report was last modified 3 years and 66 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.