From 06f3583b1c860b24f2f704f216f4db8fd1dcae9c Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tomberek@gmail.com>
Date: Sat, 26 Nov 2022 09:06:39 -0500
Subject: [PATCH] feat: break out of shebang processing for non-comments

---
 src/libutil/args.cc               |  3 ++-
 tests/functional/flakes/flakes.sh | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 80216e7ad..d90374adc 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -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;
diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
index f27925493..28b5e4e0f 100644
--- a/tests/functional/flakes/flakes.sh
+++ b/tests/functional/flakes/flakes.sh
@@ -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" ]]