X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=setup.sh;h=55efa84bb13cadfae3cbef9ea446eff703f5c3b2;hb=9d8a67ce233b2f76256fe3f1127232ad540ff865;hp=7f5ab282cf9865d8f70543e36810e43b8c31e353;hpb=19f42331cfee4cc5d76f2f789eade66db25ef531;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index 7f5ab28..55efa84 100755 --- a/setup.sh +++ b/setup.sh @@ -34,8 +34,6 @@ if ! infocmp > /dev/null 2>&1; then fi -hostname=`hostname` - # Create private temporary directory used by many tools (including GNU screen # and tmux). mkdir -p ~/.tmp @@ -91,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 @@ -111,6 +109,24 @@ if test ! -d /sys/class/power_supply/BAT0; then mv screenrc.tmp screenrc fi +if installed tmux; then + generate perl tmux.conf ./bin/remove-continuation.pl + + # 256 colors not available. + if test -z "$use_256colors"; then + echo tmux.conf: removing 256 colors + sed 's/Enable 256 color/Disable 256 color/; + 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. generate cat htoprc .in @@ -136,7 +152,6 @@ fi link inputrc ~/.inputrc link screenrc ~/.screenrc if installed tmux; then - generate perl tmux.conf ./bin/remove-continuation.pl link tmux.conf ~/.tmux.conf fi if installed htop; then