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

diff --git a/setup.sh b/setup.sh
index 761e4bc..51074e2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,21 @@
 
 # Setup script for shell configuration files.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 . ../lib.sh
 
@@ -19,9 +34,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 +84,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