diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-12-27 22:09:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-01-05 15:01:29 +0100 |
| commit | b5e3701f1aafacb6440cf18275a7f72a683d456e (patch) | |
| tree | 03016d335fb50f8f39dfbd5cf57431cad023bd80 /guix/scripts | |
| parent | 632e2f7ce19abf109945abf572ac3c22b50cf892 (diff) | |
environment: Avoid false positive on 'PS1' check.
* guix/scripts/environment.scm (validate-child-shell-environment): Do
not warn when 'PS1' refers to 'GUIX_ENVIRONMENT'.
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/environment.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index bdbfa03fcf..c7fd8fd340 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -601,7 +601,12 @@ environment~%"))) (match (vhash-assoc "PS1" actual) (#f #f) ((_ . 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~%")) (display-hint (G_ "Consider setting a different prompt for environment shells to make them distinguishable. |