From 4b9ea3d7cb12678c3e8dd0bad1261bcc66b14a96 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Thu, 6 Mar 2025 21:18:33 +0100 Subject: [PATCH] Backport: Possibly fix .Xresources not being loaded Signed-off-by: AnErrupTion --- res/xsetup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/xsetup.sh b/res/xsetup.sh index 2c962f5..e73d357 100755 --- a/res/xsetup.sh +++ b/res/xsetup.sh @@ -83,6 +83,10 @@ if [ -d "$xsessionddir" ]; then done fi +if [ -f "$USERXSESSION" ]; then + . "$USERXSESSION" +fi + if [ -d /etc/X11/Xresources ]; then for i in /etc/X11/Xresources/*; do [ -f $i ] && xrdb -merge $i @@ -93,10 +97,6 @@ fi [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources [ -f $XDG_CONFIG_HOME/X11/Xresources ] && xrdb -merge $XDG_CONFIG_HOME/X11/Xresources -if [ -f "$USERXSESSION" ]; then - . "$USERXSESSION" -fi - if [ -z "$*" ]; then exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." else