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

diff --git a/setup.sh b/setup.sh
index a7ae8fd..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
 
@@ -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
@@ -33,6 +55,16 @@ if installed rxvt; then
     sed 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
 fi
+# Display current battery charge on computers with a battery. Necessary lines
+# are marked as "(BATTERY)".
+if [ ! -d /sys/class/power_supply/BAT0 ]; then
+    echo screenrc: removing battery display
+    grep -v '(BATTERY)' screenrc > screenrc.tmp
+    mv screenrc.tmp screenrc
+fi
+
+# Htop overwrites the comments in its configuration file.
+generate cat htoprc .in
 
 # Link setup for shells.
 link shell ~/.shell
@@ -40,14 +72,27 @@ link bash ~/.bash
 link bash/rc ~/.bashrc
 link bash/profile ~/.bash_profile
 link bash/logout ~/.bash_logout
+if installed csh; then
+    link csh/rc ~/.cshrc
+fi
 link zsh ~/.zsh
 link zsh/env ~/.zshenv
 link zsh/rc ~/.zshrc
 link zsh/logout ~/.zlogout
 
 # Link setup for additional files.
+link lessfilter ~/.lessfilter
 if installed colordiff; then
     link colordiffrc ~/.colordiffrc
 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