me/guix
Archived
1
0
Fork 0
Code Activity

environment: Avoid false positive on 'PS1' check.

Browse source 
* guix/scripts/environment.scm (validate-child-shell-environment): Do
not warn when 'PS1' refers to 'GUIX_ENVIRONMENT'.
This commit is contained in:
Ludovic Courtès 2022-12-27 22:09:03 +01:00
parent 632e2f7ce1
commit b5e3701f1a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
guix/scripts/environment.scm
View file

@ -601,7 +601,12 @@ environment~%")))
(match (vhash-assoc "PS1" actual) (match (vhash-assoc "PS1" actual)
(#f #f) (#f #f)
((_ . str) ((_ . str)
(when (and (getenv "PS1") (string=? str (getenv "PS1"))) (when (and (getenv "PS1") (string=? str (getenv "PS1"))
;; 'PS1' might be conditional on 'GUIX_ENVIRONMENT', as
;; shown in the hint below.
(not (or (string-contains str "$GUIX_ENVIRONMENT")
(string-contains str "${GUIX_ENVIRONMENT"))))
(warning (G_ "'PS1' is the same in sub-shell~%")) (warning (G_ "'PS1' is the same in sub-shell~%"))
(display-hint (G_ "Consider setting a different prompt for (display-hint (G_ "Consider setting a different prompt for
environment shells to make them distinguishable. environment shells to make them distinguishable.