diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-07-14 00:54:40 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-07-14 01:05:34 +0200 |
| commit | af4c103595a725194318f40fc5aba110772ff417 (patch) | |
| tree | 363e0a586973ccd006e22772ce6a45d19ce7eaa5 /tests | |
| parent | 8af749224fd69daee5b67295186c77becb1a4479 (diff) | |
| download | guix-af4c103595a725194318f40fc5aba110772ff417.tar.gz guix-af4c103595a725194318f40fc5aba110772ff417.zip | |
home: services: environment-variables: Double-quote values.
Fixes <https://issues.guix.gnu.org/54469>.
Reported by Maxime Devos <maximedevos@telenet.be>.
* gnu/home/services.scm (environment-variable-shell-definitions): New
procedure, with code formerly in 'serialize-posix-env-vars'.
(environment-variables->setup-environment-script): Change
"setup-environment" from 'mixed-text-file' to 'computed-file', and use
'environment-variable-shell-definitions'.
* tests/guix-home.sh: Test it.
* gnu/home/services/shells.scm (serialize-posix-env-vars): Delegate to
'environment-variable-shell-definitions'.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-home.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/guix-home.sh b/tests/guix-home.sh index a3c979530d..1d1acbfd6e 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -79,6 +79,10 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT (guix-defaults? #t) (bashrc (list (local-file "dot-bashrc"))))) + (simple-service 'add-environment-variable + home-environment-variables-service-type + '(("TODAY" . "26 messidor"))) + (simple-service 'home-bash-service-extension-test home-bash-service-type (home-bash-extension @@ -141,6 +145,7 @@ EOF # the content of bashrc-test-config.sh" grep -q "the content of ~/.config/test.conf" "${HOME}/.config/test.conf" grep '^export PS1="\$GUIX_ENVIRONMENT λ "$' "${HOME}/.bash_profile" + ( . "${HOME}/.guix-home/setup-environment"; test "$TODAY" = "26 messidor" ) # This one should still be here. grep "stay around" "$HOME/.config/random-file" |