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

sloccount: Wrap shell scripts #61597

Merged
merged 1 commit into from May 18, 2019
Merged

sloccount: Wrap shell scripts #61597

merged 1 commit into from May 18, 2019

Conversation

xbreak
Copy link
Contributor

@xbreak xbreak commented May 16, 2019

Motivation for this change

sloccount scripts are not wrapped so invoking sloccount fails because it doesn't find its companion scripts and binaries:

$ sloccount .
/nix/store/ankhdwbyalcvh3xm3kswzm57wyy9cysm-sloccount-2.26/bin/sloccount: line 215: make_filelists: command not found

I avoid wrapping the compiled binaries (c_count, java_count and jsp_count for example) because they don't seem to need it. I can change this to wrap everything as well if it's preferable.

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 (CentOS 7.4 single user)
  • 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 nix-review --run "nix-review wip"
  • *Tested execution of a number of scripts and binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

* I also ran sloccount on the sloccount provided "testcode" as well, which exercises a number of languages, without problems.


This fixes the issue that when `sloccount` is invoked it would fail
due to missing PATH to companion scripts.
Copy link
Contributor

@charles-dyfis-net charles-dyfis-net left a comment

Choose a reason for hiding this comment

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

👍 -- and thank you for being rigorous about shell quoting.

@globin globin merged commit e7103e6 into NixOS:master May 18, 2019
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