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

diff --git a/setup.sh b/setup.sh
index 6c500a8..df9b80e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,8 +18,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
+
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
@@ -31,7 +34,7 @@ if installed X; then
     # Prevent code duplication. Term* rules are for all terminals; XTerm rules
     # are for XTerm and UXTerm. At the moment XTerm, UXTerm and Rxvt are
     # supported.
-    generate perl Xdefaults -ne \
+    generate Xdefaults .in perl -ne \
         'if (/^Term/) {
              s/^Term//;
              print "XTerm", $_;
@@ -44,13 +47,19 @@ if installed X; then
          } else {
              print $_;
          }'
-    # Xdefaults uses ! as comment instead of #. tmp file necessary because of
-    # different implementations of `sed -i`.
-    sed 's/^#/!/' Xdefaults > Xdefaults.tmp
-    mv Xdefaults.tmp Xdefaults
+    # Xdefaults uses ! as comment instead of #.
+    sed_i 's/^#/!/' Xdefaults
 
-    if [ x`os` != xdarwin ]; then
+    if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
+        # lightdm doesn't use ~/.xinitrc but ~/.xprofile instead. Assume it's
+        # used when the lightdm configuration file is present.
+        if test -f "$HOME/.dmrc"; then
+            link xinitrc ~/.xprofile
+        fi
+    fi
+    if test -f xinitrc.local; then
+        link xinitrc.local ~/.xinitrc.local
     fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
@@ -64,3 +73,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