X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=5f18eb24fea09b0ef5d00e9c6e9a2814887b8520;hb=072940bc627a03cf9ce6df251c8150b6926df2ef;hp=761e4bc2408a96f274776b72cfdccd478dbaaba0;hpb=a6b198e074f582b9609f83c44d096149d9d9cc95;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 761e4bc..5f18eb2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -19,9 +19,16 @@ if [ $hostname != asp -a $hostname != systemofadown ]; then
          s/screen-256color/screen/' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
 fi
+# Some options are only necessary when running as root. They are marked as
+# "(ROOT)".
+if [ x`id -u` != x0 ]; then
+    echo screenrc: removing root options
+    grep -v '(ROOT)' 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
+if [ $hostname != asp -o x`id -u` = x0 ]; then
     echo screenrc: removing Git features
     grep -v '(GIT)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
@@ -62,6 +69,9 @@ if installed colordiff; then
 fi
 link inputrc ~/.inputrc
 link screenrc ~/.screenrc
+if installed tmux; then
+    link tmux.conf ~/.tmux.conf
+fi
 
 # Create rlwrap history directory.
 mkdir -p shell/rlwrap