subcmd and dash fixes

Author: fprimex

junonia

@@ -772,7 +772,7 @@ _junonia_md2spec () {
   '
 
   awk -v wrap="$JUNONIA_WRAP" -v col1="$JUNONIA_COL1" \
-      -v col2="$JUNONIA_COL2" -v cmd="$1" \
+      -v col2="$JUNONIA_COL2" \
       "$JUNONIA_AWKS $awk_prog" "$@"
 }
 
@@ -820,7 +820,9 @@ _junonia_md2help () {
       # If help docs have started, this signals the end of processing the
       # non-subcommand documentation.
       if(cmd_doc_start) {
+        cmd_doc_start = 0
         cmd_doc_end = 1
+        echodebug("end command documentation")
       }
 
       # Extract the commands, subcommands, and aliases in this header
@@ -855,6 +857,7 @@ _junonia_md2help () {
       if(n == 1) {
         txt = txt "  " cmd_part "\n"
         cmd_doc_start = 1
+        echodebug("start command documentation")
       }
 
       next
@@ -883,10 +886,11 @@ _junonia_md2help () {
       # Get the last primary subcommand (not the aliases) and build a regex to
       # find this commands subcommands to document.
       split($0, subcmda, ",")
-      subcmd_re = "^" subcmda[1] " [-_A-Za-z0-9]+(,|$)"
+      subcmd_re = "^" subcmda[1] " [-_A-Za-z0-9]+"
       echodebug("  subcmd regex: " subcmd_re)
 
       cmd_doc_start = 1
+      echodebug("start command documentation")
       i++
       next
     }
@@ -1387,7 +1391,7 @@ _junonia_cache () {
   fi
 
   if [ $clear ]; then
-    if ! cachedir_abspath="$((cd "$JUNONIA_CACHEDIR" &&
+    if ! cachedir_abspath="$( (cd "$JUNONIA_CACHEDIR" &&
                              pwd -P) 2>/dev/null)"; then
       echoerr "unable to clear cache. could not enter directory:"
       echoerr "$JUNONIA_CACHEDIR"
@@ -1766,7 +1770,7 @@ junonia_init () {
   JUNONIA_COL1="${JUNONIA_COL1:-18}"
   JUNONIA_COL2="${JUNONIA_COL2:-60}"
 
-  readonly JUNONIA_VERSION="1.0.3"
+  readonly JUNONIA_VERSION="1.0.4"
 
   # Information Separator control characters (IS4 - IS1)
   readonly JUNONIA_FS="" # File   Separator (FS / IS4 / dec 28)
@@ -2509,7 +2513,7 @@ _junonia_run_final () {
             #print s
           }
         }
-      ' "$_junonia_cmds"
+      ' "$_junonia_cmds" -
     )"
 
     echodebug "$spec"
@@ -2547,12 +2551,16 @@ _junonia_exec () {
 
   filter_func="$1"
   shift
+
   md="$1"
   shift
+
   spec_type="$1"
   shift
+
   spec="$1"
   shift
+
   func="$1"
   shift
 
@@ -2593,8 +2601,9 @@ _junonia_exec () {
   # The filter function might indicate via its return value, or the meta filter
   # by looking at the spec, that we should shift off some common (and possibly
   # other) values.
+  echodebug "Shifting $shift_n arguments"
   i=0
-  while [ $i -lt $shift_n ]; do
+  while [ $i -lt $# ] && [ $i -lt $shift_n ]; do
     shift
     i=$(( $i + 1 ))
   done