colin/sxmo-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not touch env XDG_RUNTIME_DIR if Sxmo is not running

Browse Source 
This was causing problems if sxmo-utils was installed, but not used.
This is a revised version of Aren's patch: Clean up handling of XDG_RUNTIME_DIR
This commit is contained in:
Willow Barraco
2023-10-11 16:55:10 +02:00
parent 86555424ed
commit e2f767bde8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configs/profile.d/sxmo_init.sh
View File

@@ -9,15 +9,18 @@
_sxmo_is_running() {
unset SXMO_WM
if [ -f "${XDG_RUNTIME_DIR}"/sxmo.swaysock ]; then
unset SWAYSOCK
if SWAYSOCK="$(cat "${XDG_RUNTIME_DIR}"/sxmo.swaysock)" \
swaymsg 2>/dev/null; then
_XDG_RUNTIME_DIR="$(_sxmo_find_runtime_dir)"
if [ -f "${_XDG_RUNTIME_DIR}"/sxmo.swaysock ]; then
if SWAYSOCK="$(cat "${_XDG_RUNTIME_DIR}"/sxmo.swaysock)" swaymsg 2>/dev/null
then
printf "Detected the Sway environment\n" >&2
export SXMO_WM=sway
unset _XDG_RUNTIME_DIR
return 0
fi
fi
unset _XDG_RUNTIME_DIR
if DISPLAY=:0 xrandr >/dev/null 2>&1; then
printf "Detected the Dwm environment\n" >&2
@@ -117,13 +120,13 @@ $PATH"
}
_sxmo_grab_session() {
XDG_RUNTIME_DIR="$(_sxmo_find_runtime_dir)"
export XDG_RUNTIME_DIR
if ! _sxmo_is_running; then
unset XDG_RUNTIME_DIR
return
fi
XDG_RUNTIME_DIR="$(_sxmo_find_runtime_dir)"
export XDG_RUNTIME_DIR
_sxmo_load_environments
if [ -f "$XDG_RUNTIME_DIR"/dbus.bus ]; then