diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2023-07-06 16:53:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-07-11 15:47:56 +0200 |
| commit | 7d9fdfb19d17dc99a4cf2548942c4f8ae7433572 (patch) | |
| tree | f305e9345d55cf2e60fe76f34c8ffe3f2d687e9f /tests/guix-home.sh | |
| parent | fe3321f91ae331d3f1d4a389f28fdf02f74da7e8 (diff) | |
home: services: bash: Properly quote shell aliases.
Fixes <https://issues.guix.gnu.org/63048>.
Reported by Ekaitz Zarraga <ekaitz@elenq.tech>.
* gnu/home/services.scm (with-shell-quotation-bindings): New procedure.
(environment-variable-shell-definitions): Use it instead of inline copy.
* gnu/home/services/shells.scm (bash-serialize-aliases): Use it. Add
clause for 'literal-string?'.
* tests/guix-home.sh: Add 'aliases' to 'home-bash-extension' and test it.
Diffstat (limited to 'tests/guix-home.sh')
| -rw-r--r-- | tests/guix-home.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/guix-home.sh b/tests/guix-home.sh index e9ef76c862..e6d16d7fab 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -1,7 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2021-2023 Andrew Tropin <andrew@trop.in> # Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com> -# Copyright © 2022 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2022, 2023 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -94,6 +94,9 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT (home-bash-extension (environment-variables '(("PS1" . "$GUIX_ENVIRONMENT λ "))) + (aliases + `(("run" . "guix shell") + ("path" . ,(literal-string "echo $PATH")))) (bashrc (list (plain-file @@ -149,6 +152,8 @@ EOF test -d "${HOME}/.guix-home" test -h "${HOME}/.bash_profile" test -h "${HOME}/.bashrc" + grep 'alias run="guix shell"' "$HOME/.bashrc" + grep "alias path='echo \$PATH'" "$HOME/.bashrc" test "$(tail -n 2 "${HOME}/.bashrc")" == "\ # dot-bashrc test file for guix home # the content of bashrc-test-config.sh" |