From 2059fd52c93e0c75c17832db70bb010c5e9819da Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@jdbernard.com>
Date: Fri, 29 Jan 2021 10:11:33 -0600
Subject: [PATCH] Default to appending passed arguments with the option to
 switch back to prepending.

---
 cmd_shell.nim    | 22 ++++++++++++++--------
 cmd_shell.nimble |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cmd_shell.nim b/cmd_shell.nim
index 4c355eb..7c4a27c 100644
--- a/cmd_shell.nim
+++ b/cmd_shell.nim
@@ -1,4 +1,4 @@
-import cliutils, linenoise, os, osproc, sequtils, strutils
+import cliutils, docopt, linenoise, os, osproc, sequtils, strutils
 
 proc writeOutput(msg, errMsg: TaintedString, cmd: string): void =
   if not msg.isEmptyOrWhitespace: stdout.writeLine(msg)
@@ -6,15 +6,18 @@ proc writeOutput(msg, errMsg: TaintedString, cmd: string): void =
 
 when isMainModule:
 
-  if paramCount() == 0:
-    stderr.writeLine "cmd_shell: no arguments"
-    quit(QuitFailure)
+  let usage = """
+Usage:
+  cmd_shell [--prepend-args] <cmd> [-- <args>...]
+"""
+  # Parse arguments
+  let args = docopt(usage, version = "1.1.0")
 
-  let cmdPrompt = paramStr(1)
+  let cmdPrompt = $args["<cmd>"]
   let cmd = '"' & cmdPrompt & '"'
 
-  let args =
-    if paramCount() > 1: commandLineParams()[1..^1].mapIt("'" & $it & "'").join(" ")
+  let argsForCmd =
+    if args["<args>"]: @(args["<args>"]).mapIt("'" & $it & "'").join(" ")
     else: ""
 
   discard historySetMaxLen(
@@ -24,6 +27,9 @@ when isMainModule:
   var line = readLine(cmdPrompt & "> ")
 
   while line != nil:
-    discard exec(cmd & " " & args & $line, "", [], nil, {poUsePath, poEvalCommand}, writeOutput)
+    if args["--prepend-args"]:
+      discard exec(cmd & " " & argsForCmd & " " & $line, "", [], nil, {poUsePath, poEvalCommand}, writeOutput)
+    else:
+      discard exec(cmd & " " & $line & " " & argsForCmd, "", [], nil, {poUsePath, poEvalCommand}, writeOutput)
     historyAdd(line)
     line = readLine(cmdPrompt & "> ")
diff --git a/cmd_shell.nimble b/cmd_shell.nimble
index fec6103..28f03fd 100644
--- a/cmd_shell.nimble
+++ b/cmd_shell.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "1.0.0"
+version       = "1.1.0"
 author        = "Jonathan Bernard"
 description   = "Wrapper around CLI commands (passing input as arguments)."
 license       = "MIT"