Subject: bug#54356: closed (Re: bug#54356: [PATCH] home: services: Fix bash aliases without guix-defaults.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 18 Mar 2022 14:03:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
54356: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54356
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#54356: [PATCH] home: services: Fix bash aliases without guix-defaults.
From: Ludovic Courtès <[email-masked]>
To: angry rectangle <[email-masked]>
Cc: [email-masked]
Date: Fri, 18 Mar 2022 15:02:15 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

angry rectangle <[email-masked]> skribis:

>>>From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001
> From: angryrectangle <[email-masked]>
> 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’.

Subject: [PATCH] home: services: Fix bash aliases without guix-defaults.
From: angry rectangle <[email-masked]>
To: [email-masked]
Date: Sat, 12 Mar 2022 15:53:31 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

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.
>From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001
From: angryrectangle <[email-masked]>
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