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

diff --git a/setup.sh b/setup.sh
index 53fc267..df9b80e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,6 +22,7 @@ set -e
 
 . ../lib.sh
 
+
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
@@ -33,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", $_;
@@ -46,15 +47,18 @@ 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 [ -f xinitrc.local ]; then
+    if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local
     fi
     link xmodmaprc ~/.xmodmaprc