bug#70205: closed ([PATCH] home: services: bash: Move default PS1 prompt to bashrc)

[GNU bug Tracking System]

Your message dated Mon, 29 Apr 2024 23:53:54 +0200
with message-id <87mspbzvgt.fsf@gnu.org>
and subject line Re: [bug#70205] [PATCH] home: services: bash: Move default PS1 
prompt to bashrc
has caused the debbugs.gnu.org bug report #70205,
regarding [PATCH] home: services: bash: Move default PS1 prompt to bashrc
to be marked as done.

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


-- 
70205: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=70205
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] home: services: bash: Move default PS1 prompt to bashrc
>
>
>
>
> Date: 
>
> Thu,  4 Apr 2024 18:53:27 -0400
>
>
>
>
> Reported in <https://issues.guix.gnu.org/70164>.
>
> * home/services/shells.scm (add-bash-configuration): Move default PS1 prompt
> from .bash_profile to .bashrc.
>
> Change-Id: Ic437458ee362cc4aa803a71c9962af866749f59a
> ---
> Hi Guix!
>
> See the issue mentioned in the commit message for the motivation for
> this patch.
>
>  gnu/home/services/shells.scm | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
> index 8fd1668b59..a5b2586dde 100644
> --- a/gnu/home/services/shells.scm
> +++ b/gnu/home/services/shells.scm
> @@ -415,14 +415,6 @@ (define (add-bash-configuration config)
>  if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
>  "
>  
> -        ;; The host distro might provide a bad 'PS1' default--e.g., not taking
> -        ;; $GUIX_ENVIRONMENT into account.  Provide a good default here when
> -        ;; asked to.  The default can be overridden below via
> -        ;; 'environment-variables'.
> -        (if (home-bash-configuration-guix-defaults? config)
> -            "PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ '\n"
> -            "")
> -
>          (serialize-field 'bash-profile)
>          (serialize-field 'environment-variables)))
>  
> @@ -430,6 +422,10 @@ (define (add-bash-configuration config)
>                'bashrc
>                (if (home-bash-configuration-guix-defaults? config)
>                    (list (plain-file-content %default-bashrc)
> +                        ;; The host distro might provide a bad 'PS1'
> +                        ;; default--e.g., not taking $GUIX_ENVIRONMENT into
> +                        ;; account.  Provide a good default here when asked.
> +                        "PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ '"
>                          (serialize-field 'aliases))
>                    (list (serialize-field 'aliases))))
>               (file-if-not-empty 'bash-logout)))))
>
> base-commit: ade6845da6cec99f3bca46faac9b2bad6877817e
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#70205] [PATCH] home: services: bash: Move default PS1 prompt to bashrc
>
>
>
>
> Date: 
>
> Mon, 29 Apr 2024 23:53:54 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> Hi Richard,
>
> Richard Sent <richard@freakingpenguin.com> skribis:
>
> > Reported in <https://issues.guix.gnu.org/70164>.
> >
> > * home/services/shells.scm (add-bash-configuration): Move default PS1 prompt
> > from .bash_profile to .bashrc.
> >
> > Change-Id: Ic437458ee362cc4aa803a71c9962af866749f59a
>
> Sounds reasonable to me; thanks for the clear explanation in
> <https://issues.guix.gnu.org/70164>.
>
> There was one missing newline before aliases so I made the following
> change (adding two newlines, for good measure).
>
> Applied, thanks!
>
> Ludo’.
>
> diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
> index a5b2586dde..ee6b09f17c 100644
> --- a/gnu/home/services/shells.scm
> +++ b/gnu/home/services/shells.scm
> @@ -421,11 +421,11 @@ (define (add-bash-configuration config)
>       ,@(list (file-if-not-empty
>                'bashrc
>                (if (home-bash-configuration-guix-defaults? config)
> -                  (list (plain-file-content %default-bashrc)
> +                  (list (plain-file-content %default-bashrc) "\n"
>                          ;; The host distro might provide a bad 'PS1'
>                          ;; default--e.g., not taking $GUIX_ENVIRONMENT into
>                          ;; account.  Provide a good default here when asked.
> -                        "PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ '"
> +                        "PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ '\n"
>                          (serialize-field 'aliases))
>                    (list (serialize-field 'aliases))))
>               (file-if-not-empty 'bash-logout)))))
>
> --- End Message ---