From d8bcd2c3d8f0bb346ed899ee1a971de488d4178b Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sat, 6 Oct 2018 19:48:43 +0000 Subject: nixos/bash: Use `escapeShellArg` for shell aliases This patch uses the library function `lib.escapeShellArg` to improve the handling of shell aliases in the NixOS module `bash`, copying the corresponding change made to the `zsh` module in commit 1e211a70cbdaf230a18ea4cb67a959039d5c2ddb (for which GitHub pull request #47471 was filed). This patch resolves GitHub issue #16973. This change presumably also should be copied to the `fish` module, but I don't know `fish` syntax so that won't be done by me. GitHub: Close NixOS/nixpkgs#16973. --- nixos/modules/programs/bash/bash.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/programs') diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 424e1506b4c5..f664e2225550 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -33,7 +33,7 @@ let ''; bashAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases ); in -- cgit 1.4.1