tmux.conf: Use Zsh as shell if available.

diff --git a/setup.sh b/setup.sh
index 3950d1511a72d61fcb2030c5ce10e5f01c85cfa3..cc77d54e5a6c7b6a450ad69e7f030e907e4c2475 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -119,6 +119,12 @@ if installed tmux; then
              s/screen-256color/screen/' tmux.conf > tmux.conf.tmp
         mv tmux.conf.tmp tmux.conf
     fi
+    # Tmux doesn't display a warning if the shell wasn't found!
+    if test ! -x '/bin/zsh'; then
+        echo tmux.conf: removing /bin/zsh as shell
+        sed 's/zsh/sh/' tmux.conf > tmux.conf.tmp
+        mv tmux.conf.tmp tmux.conf
+    fi
 fi
 
 # Htop overwrites the comments in its configuration file.

diff --git a/tmux.conf.in b/tmux.conf.in
index 9c22dfb9694541f723ef2827f102311a8ba45715..2c2774400e16d9bfe3bf52eef0f28c738710e86b 100644 (file)
--- a/tmux.conf.in
+++ b/tmux.conf.in
@@ -23,6 +23,10 @@
 
 # GENERAL
 
+# Use Zsh as shell. Tmux does not display a warning if the shell isn't
+# available!
+set-option -g default-shell "/bin/zsh"
+
 # Use a larger window history, in lines.
 set-option -g history-limit 10000