X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=755e292ee0458b0bc3204b282c8724e3931fa21c;hb=f0217d1f48f76af5f5be9e51f81403c5ff103204;hp=c6623c8e1bd3df721fc5ca01dd589d234ae982ac;hpb=bccd737aea78f680577f952eaa1a01bdacc95c9f;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index c6623c8..755e292 100755
--- a/setup.sh
+++ b/setup.sh
@@ -19,18 +19,34 @@ 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
 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
+# 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
 
 # Link setup for shells.
 link shell ~/.shell
@@ -38,14 +54,21 @@ 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
+
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap