xinitrc: Move settings from xmodmaprc to xinitrc.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 53fc2672691662b8c68cd9bab0d6c26e6863aaab..0e456ac34a90cf38e74972ccd4d311c38973df45 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -51,10 +51,15 @@ 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
+        # 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