properly quote cli args in several locations

tek · Sep 6, 2023 · 2aa03ef · 2aa03ef
1 parent 856ce95
commit 2aa03ef
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/lib/command.nix b/lib/command.nix
@@ -31,12 +31,12 @@ let
     if command.component
     then ''
     ${splitArgs}
-    env_runner=$(${cli} env --config ${json} ''${env_args[@]})
-    env_args="''${env_args[*]}" $env_runner "${exe} ''${cmd_args[@]}"
+    env_runner=$(${cli} env --config ${json} "''${env_args[@]}")
+    env_args="''${env_args[*]}" $env_runner "${exe} "''${cmd_args[@]}""
     ''
     else ''
     ${env.code}
-    ${exe} $@
+    ${exe} "$@"
     '';
 
 in {

diff --git a/lib/with-config.nix b/lib/with-config.nix
@@ -125,7 +125,7 @@ let
   cacheWrapper = self: name: app: pkgs.writeScript name ''
     ${config.pkgs.nix}/bin/nix --option extra-substituters 'https://tek.cachix.org' \
     --option extra-trusted-public-keys 'tek.cachix.org-1:+sdc73WFq8aEKnrVv5j/kuhmnW2hQJuqdPJF5SnaCBk=' \
-    run ${self}#${app} -- $@
+    run ${self}#${app} -- "$@"
   '';
 
   envSystemAllowed = env:

diff --git a/modules/command.nix b/modules/command.nix
@@ -14,12 +14,12 @@ let
   in "${opt "-r" "runner"}${opt "-p" "package"}${opt "-m" "module"}${opt "-c" "component"}";
 
   ghciCommand = ''
-  ghci_cmd=$(${cli} ghci-cmd --config ${json} ${ghciOpts} ''${env_args[@]} ''$@)
+  ghci_cmd=$(${cli} ghci-cmd --config ${json} ${ghciOpts} ''${env_args[@]} "''$@")
   eval $ghci_cmd
   '';
 
   ghcidCommand = ''
-  ghcid_cmd=$(${cli} ghcid-cmd --config ${json} ${ghciOpts} ''${env_args[@]} ''$@)
+  ghcid_cmd=$(${cli} ghcid-cmd --config ${json} ${ghciOpts} ''${env_args[@]} "''$@")
   eval $ghcid_cmd
   '';
 

diff --git a/modules/commands.nix b/modules/commands.nix
@@ -52,7 +52,7 @@ in {
       env = "dev";
       command = ''
       ${if config.hls.genCabal then "nix run .#gen-cabal-quiet" else ""}
-      ${config.envs.hls.hls.package}/bin/haskell-language-server $@
+      ${config.envs.hls.hls.package}/bin/haskell-language-server "$@"
       '';
       expose = true;
     };

diff --git a/test/new-static/test.nix b/test/new-static/test.nix
@@ -3,7 +3,7 @@
   test = builtins.toFile "new-static-test" ''
     mkdir root
     cd ./root
-    nix run "path:$hix_dir#new" -- --name 'red-panda'
+    nix run "path:$hix_dir#new" -- --name 'red-panda' --author='Red Panda'
     nix run .#gen-cabal
     check_match 'nix run .#ghci -- -p red-panda -t main <<< :quit' 'passed 1 test' 'Running tests in generated project failed'
     check_match 'nix run' 'Hello red-panda' 'App in generated project failed'