X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=234b17b6ad3dc0bfd75ee0da5b719628b1a85758;hb=5b041628369b1f54ab4460c6f05ec203b20d28fd;hp=e9727dc91361e8cf75fca5cf4da60cdec9090ee3;hpb=fa98a6e9ebafc93de71cd836a816bdec029bf72f;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index e9727dc..234b17b 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
 
@@ -28,7 +43,7 @@ if [ x`id -u` != x0 ]; then
 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
@@ -48,6 +63,9 @@ if [ ! -d /sys/class/power_supply/BAT0 ]; then
     mv screenrc.tmp screenrc
 fi
 
+# Htop overwrites the comments in its configuration file.
+generate cat htoprc .in
+
 # Link setup for shells.
 link shell ~/.shell
 link bash ~/.bash
@@ -69,6 +87,12 @@ if installed colordiff; then
 fi
 link inputrc ~/.inputrc
 link screenrc ~/.screenrc
+if installed tmux; then
+    link tmux.conf ~/.tmux.conf
+fi
+if installed htop; then
+    link htoprc ~/.htoprc
+fi
 
 # Create rlwrap history directory.
 mkdir -p shell/rlwrap