Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/zsh: use `escapeShellArg' for shell aliases #47471

Merged
merged 1 commit into from Sep 28, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Sep 28, 2018

Motivation for this change

Previously single quotes were used by default for aliases and the module
never warned about possible collisions when having a shell alias which
relies on single quotes.

Adding escapeShellArg works around fixes the this issue and ensures that a
properly quoted value is written to /etc/zshrc.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Previously single quotes were used by default for aliases and the module
never warned about possible collisions when having a shell alias which
relies on single quotes.

Adding `escapeShellArg` works around this fixes the issue and ensures that a
properly quoted value is written to `/etc/zshrc`.
@Ma27 Ma27 changed the title nixos/zsh: use `escapeShelLArg' for shell aliases nixos/zsh: use `escapeShellArg' for shell aliases Sep 28, 2018
@xeji xeji merged commit 1e211a7 into NixOS:master Sep 28, 2018
@Ma27 Ma27 deleted the fix-zsh-aliasing branch September 28, 2018 21:43
@8573
Copy link
Contributor

8573 commented Oct 4, 2018

Has this also been done for Bash?

8573 added a commit to 8573/nixpkgs that referenced this pull request Oct 6, 2018
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
1e211a7 (for which GitHub pull
request NixOS#47471 was filed).

This patch resolves GitHub issue NixOS#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#16973.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants