cli: jq compat, multiple -L

wader · Sep 12, 2021 · 85d1719 · 85d1719
1 parent c8f0264
commit 85d1719
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/interp/interp.jq b/pkg/interp/interp.jq
@@ -498,7 +498,7 @@ def _main:
         short: "-L",
         long: "--include-path",
         description: "Include search path",
-        string: "PATH"
+        array: "PATH"
       },
       "null_output": {
         short: "-0",
@@ -650,9 +650,7 @@ def _main:
     else
       # use _finally as display etc prints and results in empty
       _finally(
-        ( _include_paths([
-            $opts.include_path // empty
-          ]) as $_
+        ( _include_paths($opts.include_path) as $_
         | _input_filenames($opts.filenames) as $_ # store inputs
         | ( def _inputs:
               ( if $opts.null_input then null

diff --git a/pkg/interp/testdata/incudepath.fqtest b/pkg/interp/testdata/incudepath.fqtest
@@ -2,6 +2,10 @@
 def a: "a";
 $ fq -L /library -n 'include "a"; a'
 "a"
+$ fq --include-path /library -n 'include "a"; a'
+"a"
+$ fq -L /wrong -L /library -n 'include "a"; a'
+"a"
 $ fq -L /wrong -n 'include "a"; a'
 exitcode: 3
 stderr: