setup.sh: Use sed_i().

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 53fc2672691662b8c68cd9bab0d6c26e6863aaab..6506171c57ef5625d06f0e578fe216a977323812 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -46,15 +46,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