From 861842615ae39815ae9e5ee9090a82f22ea65bf3 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 20 Feb 2015 01:17:25 +0100
Subject: [PATCH] setup.sh: always symlink ~/.xsession

---
 setup.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/setup.sh b/setup.sh
index be55e52..45fda4d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -62,11 +62,9 @@ if installed X; 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
+        # 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
-- 
2.43.2