mirror of
https://github.com/fairyglade/ly.git
synced 2025-12-21 11:44:55 +00:00
Backport: Possibly fix .Xresources not being loaded
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
@@ -83,6 +83,10 @@ if [ -d "$xsessionddir" ]; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -f "$USERXSESSION" ]; then
|
||||||
|
. "$USERXSESSION"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -d /etc/X11/Xresources ]; then
|
if [ -d /etc/X11/Xresources ]; then
|
||||||
for i in /etc/X11/Xresources/*; do
|
for i in /etc/X11/Xresources/*; do
|
||||||
[ -f $i ] && xrdb -merge $i
|
[ -f $i ] && xrdb -merge $i
|
||||||
@@ -93,10 +97,6 @@ fi
|
|||||||
[ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
|
[ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
|
||||||
[ -f $XDG_CONFIG_HOME/X11/Xresources ] && xrdb -merge $XDG_CONFIG_HOME/X11/Xresources
|
[ -f $XDG_CONFIG_HOME/X11/Xresources ] && xrdb -merge $XDG_CONFIG_HOME/X11/Xresources
|
||||||
|
|
||||||
if [ -f "$USERXSESSION" ]; then
|
|
||||||
. "$USERXSESSION"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$*" ]; then
|
if [ -z "$*" ]; then
|
||||||
exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
|
exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user