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

diff --git a/setup.sh b/setup.sh
index 5aaceac..6a980a3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,23 @@
 
 # Setup script for X11 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/>.
+
+
+set -e
 
 . ../lib.sh
 
@@ -9,7 +26,7 @@ if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
 if installed xmonad; then
-    link . ~/.xmonad
+    link xmonad ~/.xmonad
 fi
 
 if installed X; then
@@ -34,13 +51,29 @@ 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
 fi
 
 if installed xpdf; then
     link xpdfrc ~/.xpdfrc
 fi
+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