salt/firestarter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More properly wrap X-specific preexecute functions

Browse Source
This commit is contained in:
Salt
2020-10-04 07:40:55 -05:00
parent 241085b08f
commit f74783a659
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
firestarter
View File

@@ -377,6 +377,8 @@ step_preexecute() {
# Disabled here because an XDGCD of KDE implies kded and other KDE parts, breaking copypasta and other things # Disabled here because an XDGCD of KDE implies kded and other KDE parts, breaking copypasta and other things
#export XDG_CURRENT_DESKTOP="KDE" #export XDG_CURRENT_DESKTOP="KDE"
fi fi
# X-specific stuff
if [ -n "$DISPLAY" ]; then
# xhost # xhost
if has xhost; then if has xhost; then
if xhost +si:localuser:"$(id -un)" >/dev/null 2>&1; then if xhost +si:localuser:"$(id -un)" >/dev/null 2>&1; then
@@ -386,7 +388,7 @@ step_preexecute() {
fi fi
fi fi
# xresources # xresources
if [ -n "$DISPLAY" ] && has xrdb && [ -r "$HOME/.Xresources" ]; then if has xrdb && [ -r "$HOME/.Xresources" ]; then
if xrdb "$HOME/.Xresources" >/dev/null 2>&1; then if xrdb "$HOME/.Xresources" >/dev/null 2>&1; then
log "Loaded in .Xresources" log "Loaded in .Xresources"
else else
@@ -405,6 +407,7 @@ step_preexecute() {
log "Disabling DPMS" log "Disabling DPMS"
xset s off -dpms xset s off -dpms
fi fi
fi
} }
step_postexecute() { step_postexecute() {
# Wait for the WM to initialize, if one was found and we have the tools # Wait for the WM to initialize, if one was found and we have the tools