fix checking for commands

[etc/tmux.git] / .bin / mtmux

diff --git a/.bin/mtmux b/.bin/mtmux
index bee0bc80de0922e30e51691a907e72ad6be6c664..0b85a48536607e8cb895c223e70af9a7bff4883d 100755 (executable)
--- a/.bin/mtmux
+++ b/.bin/mtmux
@@ -29,6 +29,7 @@ err() {
   exit $exitcode
 }
 
+cmds=
 for i in "$@"; do
   case "${state:-}:$i" in
     (:-c) state=cwd;;
@@ -49,7 +50,10 @@ for i in "$@"; do
       state=
       ;;
 
-    (:--) shift; set -- "$@"; break
+    (:--) shift; set -- "$@"; break;;
+
+    (:\;) cmds="$cmds \;";;
+    (:*) cmds="${cmds:+$cmds }$i";;
   esac
   shift 2>/dev/null || break
 done
@@ -61,7 +65,7 @@ if [ -n "${window:-}" ]; then
     warn "Both -w and -c don't make sense, ignoring -c"
     cwd=
   fi
-  if [ -n "$@" ]; then
+  if [ -n "$*" ]; then
     warn "Ignoring commands specified with -w"
     set --
   fi
@@ -69,7 +73,7 @@ if [ -n "${window:-}" ]; then
     err 1 "Missing option -n, required with -w"
   fi
 
-  args="new -t $name \; select-window -t $window"
+  args="new -t $name \;${cmds:+ $cmds \;} select-window -t $window"
 
 else
 
@@ -78,9 +82,10 @@ else
     case "$i" in
       (*:) wname="${i%:}";;
       (+|.|\;)
-        args="${args}${subcmd}${cwd:+ -c $cwd}${wname:+ -n $wname}${cmd:-} \\; "
+        args="${args}${subcmd}${cwd:+ -c $cwd}${wname:+ -n $wname}${cmd:-} \; "
+        args="$args${cmds:+$cmds \; }"
         subcmd="neww -d"
-        cmd=
+        cmd= cmds=
         ;;
       (*) cmd="${cmd:-} $i";;
     esac