Improvements for shebang-script handling (#758)

* Experimental #!/usr/bin/env mlr -s feature * Allow flags after verbs, for shebang support
johnkerl · Nov 24, 2021 · d9dbb1e · d9dbb1e
1 parent 191bdfa
commit d9dbb1e
Show file tree

Hide file tree

Showing 68 changed files with 920 additions and 206 deletions.
diff --git a/Makefile b/Makefile
@@ -52,8 +52,9 @@ dev:
 	make -C docs
 	@echo DONE
 
-# Keystroke-saver
-itso: build check install
+# Keystroke-savers
+it: build check
+so: install
 
 # Please see comments in ./create-release-tarball as well as
 # https://miller.readthedocs.io/en/latest/build/#creating-a-new-release-for-developers

diff --git a/docs/src/manpage.md b/docs/src/manpage.md
@@ -2979,5 +2979,5 @@ SEE ALSO
 
 
 
-                                  2021-11-23                         MILLER(1)
+                                  2021-11-24                         MILLER(1)
 </pre>
diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt
@@ -2958,4 +2958,4 @@ SEE ALSO
 
 
 
-                                  2021-11-23                         MILLER(1)
+                                  2021-11-24                         MILLER(1)
diff --git a/internal/pkg/auxents/repl/entry.go b/internal/pkg/auxents/repl/entry.go
@@ -137,7 +137,7 @@ func ReplMain(args []string) int {
 				argi += 1
 			}
 
-		} else if cli.FLAG_TABLE.Parse(args, argc, &argi, &options) {
+		} else if cli.FLAG_TABLE.Parse(args, argc, &argi, options) {
 
 		} else {
 			replUsage(replName, os.Stderr, 1)
@@ -150,7 +150,7 @@ func ReplMain(args []string) int {
 	// --auto-flatten is on by default. But if input and output formats are both JSON,
 	// then we don't need to actually do anything. See also mlrcli_parse.go.
 	options.WriterOptions.AutoFlatten = cli.DecideFinalFlatten(&options.WriterOptions)
-	options.WriterOptions.AutoUnflatten = cli.DecideFinalUnflatten(&options)
+	options.WriterOptions.AutoUnflatten = cli.DecideFinalUnflatten(options)
 
 	repl, err := NewRepl(
 		exeName,
@@ -159,7 +159,7 @@ func ReplMain(args []string) int {
 		showPrompts,
 		astPrintMode,
 		doWarnings,
-		&options,
+		options,
 	)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)

diff --git a/internal/pkg/cli/option_types.go b/internal/pkg/cli/option_types.go
@@ -157,8 +157,8 @@ type TOptions struct {
 }
 
 // ----------------------------------------------------------------
-func DefaultOptions() TOptions {
-	return TOptions{
+func DefaultOptions() *TOptions {
+	return &TOptions{
 		ReaderOptions: DefaultReaderOptions(),
 		WriterOptions: DefaultWriterOptions(),