X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Ftmux.bashrc;h=2bf7f05f8b9ad1ebffdfb3b4dccd929f12553881;hp=abbbff7c5b7177a291c4981fe6e9bf8f04f19aca;hb=f557b85709b56b7798276700850afe9ae2b838a5;hpb=c25605e0b426401518ee7e8bbf8db107a741bd8d

diff --git a/.profile.d/tmux.bashrc b/.profile.d/tmux.bashrc
index abbbff7..2bf7f05 100644
--- a/.profile.d/tmux.bashrc
+++ b/.profile.d/tmux.bashrc
@@ -5,7 +5,25 @@ tmux=$(find_working tmux 2>/dev/null)
 if [ $? = 0 ]; then
   alias session="bigtmux $tmux has -t session 2>/dev/null && tmux attach -t session || ktmux -R $krenew -T $tmux -s session"
   if [ -n "$TMUX" ]; then
-    $tmux run-shell "ktmux_helper -R $krenew" ';' detach 2>/dev/null
+    ktmux_args=${TMUX##*,}
+    if [ "$ktmux_args" = "$TMUX" ]; then
+      ktmux_args=
+    else
+      ktmux_args="-s $ktmux_args"
+    fi
+
+    # tmux 1.8 added -b flag to run-shell.  Prior to 1.8 we must detach.
+    tmux_version=$($tmux -V)
+    tmux_version=${tmux_version#tmux }
+    tmux_major=${tmux_version%%.*}
+    tmux_minor=${tmux_version#*.}
+    tmux_minor=${tmux_minor%%.*}
+    tmux_version=$((tmux_minor+tmux_major*10))
+    if [ $tmux_version -lt 18 ]; then
+      $tmux run-shell "ktmux_helper $ktmux_args -R $krenew" ';' detach 2>/dev/null
+    else
+      $tmux run-shell -b "ktmux_helper $ktmux_args -R $krenew" 2>/dev/null
+    fi
   fi
 fi
-unset krenew tmux
+unset krenew tmux tmux_version tmux_major tmux_minor ktmux_args