cli: more jq compat

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

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/pkg/interp/interp.jq b/pkg/interp/interp.jq
@@ -460,7 +460,7 @@ def _main:
     {
       "compact": {
         short: "-c",
-        long: "--compact",
+        long: "--compact-output",
         description: "Compact output",
         bool: true
       },
@@ -472,7 +472,7 @@ def _main:
       },
       "expr_file": {
         short: "-f",
-        long: "--file",
+        long: "--from-file",
         description: "Read EXPR from file",
         string: "PATH"
       },

diff --git a/pkg/interp/testdata/args.fqtest b/pkg/interp/testdata/args.fqtest
@@ -9,10 +9,10 @@ Tool, language and decoders for exploring binary data.
 For more information see https://github.com/wader/fq
 
 Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
---compact,-c            Compact output
+--compact-output,-c     Compact output
 --decode,-d NAME        Decode format (probe)
---file,-f PATH          Read EXPR from file
 --formats               Show supported formats
+--from-file,-f PATH     Read EXPR from file
 --help,-h               Show help
 --include-path,-L PATH  Include search path
 --join-output,-j        No newline between outputs

diff --git a/pkg/interp/testdata/exprfile.fqtest b/pkg/interp/testdata/exprfile.fqtest
@@ -11,6 +11,8 @@ $ fq -n -f /test.jq
 123
 $ fq -f /test2.jq /test.mp3
 "ID3"
+$ fq --from-file /test2.jq /test.mp3
+"ID3"
 $ fq -nf /err.jq
 exitcode: 3
 stderr:

diff --git a/pkg/interp/testdata/output.fqtest b/pkg/interp/testdata/output.fqtest