X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6a980a346d90661237a8366713f74f50c17e34a6;hb=d6507ad9c6de60f9e14c7c448d3a909151b92542;hp=6c500a8f4370b51e3b658d2f7b65f289a852d37f;hpb=80ec2902478cf11da5737951f104f55918837dd7;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 6c500a8..6a980a3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
 if installed stumpwm; then
@@ -49,9 +51,12 @@ if installed X; then
     sed 's/^#/!/' Xdefaults > Xdefaults.tmp
     mv Xdefaults.tmp Xdefaults
 
-    if [ x`os` != xdarwin ]; then
+    if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
     fi
+    if test -f xinitrc.local; then
+        link xinitrc.local ~/.xinitrc.local
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
     link XCompose ~/.XCompose
@@ -64,3 +69,11 @@ if installed zathura; then
     mkdir -p ~/.config/zathura
     link zathurarc ~/.config/zathura/zathurarc
 fi
+
+if installed feh; then
+    mkdir -p ~/.config
+    link feh ~/.config/feh
+    # Older feh versions only support theme options and configure them through
+    # ~/.fehrc.
+    link feh/themes ~/.fehrc
+fi