Makefile: Use && with cd.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index bdd05424e89a77b119f3ab57634fc532426a17d0..a7ae8fd2a52d5899b49b15c45b579458817f2936 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -5,17 +5,34 @@
 
 . ../lib.sh
 
+hostname=`hostname`
+
 # Generate ~/.less with lesskey.
 lesskey lesskey
+chmod 0600 ~/.less
 
 # As screen-256color is not widely supported use it only on machines known to
 # work.
 generate cat screenrc .in
-if [ `hostname` != asp ]; then
+if [ $hostname != asp -a $hostname != systemofadown ]; then
     sed 's/Enable 256 color/Disable 256 color/;
          s/screen-256color/screen/' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
 fi
+# I use some features of screen which are only in Git. Drop them on machines
+# which have older versions. They are marked as "(GIT)".
+if [ $hostname != asp ]; then
+    echo screenrc: removing Git features
+    grep -v '(GIT)' screenrc > screenrc.tmp
+    mv screenrc.tmp screenrc
+fi
+# Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
+# it's installed.
+if installed rxvt; then
+    echo screenrc: removing attrcolor \"fix\"
+    sed 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc > screenrc.tmp
+    mv screenrc.tmp screenrc
+fi
 
 # Link setup for shells.
 link shell ~/.shell