setup.sh: Fix GNU screen Git check.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 3950d1511a72d61fcb2030c5ce10e5f01c85cfa3..55efa84bb13cadfae3cbef9ea446eff703f5c3b2 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -89,7 +89,7 @@ fi
 # I use some features of GNU screen which are only in Git or very recent GNU
 # screen versions. Drop them on machines which have older versions. They are
 # marked as "(GIT)".
-if test -d "$HOME/development/shell/screen"; then
+if test ! -d "$HOME/development/shell/screen"; then
     echo screenrc: removing Git features
     grep -v '(GIT)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
@@ -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.