Update to 1.30.0

1 files changed, 7 insertions, 16 deletions

diff --git a/Xsession b/Xsession
index 58920534254f..4a2a25ea118d 100644
--- a/Xsession
+++ b/Xsession
@@ -16,7 +16,7 @@ done
 for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
     if [ -f "$file" ]; then
         echo "Loading resource: $file"
-        xrdb -nocpp -merge "$file"
+        xrdb -merge "$file"
     fi
 done
 
@@ -41,7 +41,7 @@ fi
 
 unset XKB_IN_USE
 
-# Run all system xinitrc shell scripts.
+# Run all system xinitrc shell scripts
 xinitdir="/etc/X11/xinit/xinitrc.d"
 if [ -d "$xinitdir" ]; then
     for script in $xinitdir/*; do
@@ -52,20 +52,11 @@ if [ -d "$xinitdir" ]; then
     done
 fi
 
-# Load xsession scripts
-xsessionddir="/etc/X11/xsession.d"
-if [ -d "$xsessionddir" ]; then
-    for i in `ls $xsessionddir`; do
-        script="$xsessionddir/$i"
-        echo "Loading X session script $script"
-        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-            . "$script"
-        fi
-    done
-fi
-if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
-    echo "Loading user X session script"
-        . "$HOME/.xsession"
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+    echo "Loading xsession script $script"
+    . "$script"
 fi
 
 echo "X session wrapper complete, running session $@"