setup.sh: always symlink ~/.xsession

diff --git a/setup.sh b/setup.sh
index be55e5252c2bb3895717d395884cea72711d8d24..45fda4d984c7d42585f0eaaf2226229a089d2dab 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -62,11 +62,9 @@ if installed X; then
 
     if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
 
     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
+        # Most display managers use ~/.xsession instead of ~/.xinitrc (which
+        # is used by e.g. startx). Provide both links.
+        link xinitrc ~/.xsession

     fi
     if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local
     fi
     if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local