picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

feat: break out of shebang processing for non-comments

Browse source
This commit is contained in:
Tom Bereknyei 2022-11-26 09:06:39 -05:00 committed by tomberek
parent 01f61cefcb
commit 06f3583b1c
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/args.cc
View file

@ -121,7 +121,8 @@ void Args::parseCmdline(const std::string & programName, const Strings & _cmdlin
std::string line;
std::getline(stream,line);
while (std::getline(stream,line) && !line.empty()){
std::string commentChars("#/\\%@*-");
while (std::getline(stream,line) && !line.empty() && commentChars.find(line[0]) != std::string::npos){
line = chomp(line);
std::smatch match;

20
tests/functional/flakes/flakes.sh
View file

@ -80,17 +80,17 @@ chmod +x "$nonFlakeDir/shebang.sh"
git -C "$nonFlakeDir" add README.md shebang.sh
git -C "$nonFlakeDir" commit -m 'Initial'
cat > $nonFlakeDir/shebang-perl.sh <<EOF
cat > $nonFlakeDir/shebang-comments.sh <<EOF
#! $(type -P env) nix
#! nix run nixpkgs#perl
## Modules used
use strict;
use warnings;
# Print function
print("Hello World\n");
# some comments
# some comments
# some comments
#! nix --offline shell
#! nix flake1#fooScript
#! nix --no-write-lock-file --command bash
foo
EOF
chmod +x $nonFlakeDir/shebang-perl.sh
chmod +x $nonFlakeDir/shebang-comments.sh
# Construct a custom registry, additionally test the --registry flag
nix registry add --registry "$registry" flake1 "git+file://$flake1Dir"
@ -538,4 +538,4 @@ expectStderr 1 nix flake metadata "$flake2Dir" --no-allow-dirty --reference-lock
# Test shebang
[[ $($nonFlakeDir/shebang.sh) = "foo" ]]
[[ $($nonFlakeDir/shebang.sh "bar") = "foo"$'\n'"bar" ]]
[[ $($nonFlakeDir/shebang-perl.sh ) = "Hello World!" ]]
[[ $($nonFlakeDir/shebang-comments.sh ) = "foo" ]]