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

hicolor-icon-theme: fix quoting shell variables in setup hook #98426

Merged
merged 1 commit into from Sep 30, 2020
Merged

hicolor-icon-theme: fix quoting shell variables in setup hook #98426

merged 1 commit into from Sep 30, 2020

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Sep 21, 2020

Motivation for this change

Without quoting the hook fails with themes with spaces in the name.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/306

IFS=',' read -ra parent_themes <<< "$inheritance"
for parent_theme in "${parent_themes[@]}"; do
parent_path=""
if [ -e "$out/share/icons/$parent_theme" ]; then
parent_path="$(realpath $out/share/icons/$parent_theme)"
parent_path=$(realpath $out/share/icons/"$parent_theme")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be cases where where the parent_path will break (IIRC, if the variable contains a new line), so if we want to be shellcheck precise we probably need something like this:

Suggested change
parent_path=$(realpath $out/share/icons/"$parent_theme")
parent_path="$(realpath "$out/share/icons/$parent_theme")"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@romildo romildo merged commit d6a12e8 into NixOS:master Sep 30, 2020
@romildo romildo deleted the fix.hicolor-icon-theme branch September 30, 2020 13:55
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

3 participants