[X2Go-Commits] [live-build-x2go] 05/06: taking a different approach at detecting a running X2Go session - searching for the presence of a window class named "X2GoAgent"

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

commit d09800f6678c45698311bc9dba2a869ef9bc8e95
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Mar 12 20:31:52 2022 +0100

    taking a different approach at detecting a running X2Go session -
    searching for the presence of a window class named "X2GoAgent"
---
 .../includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
index 00bb22d..863b3fe 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround
@@ -10,11 +10,11 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then
 elif grep 'nomagicpixel=1' /proc/cmdline ; then
 	echo -en "\n$(date +'%F | %T | ')'$0' spawning openbox monitor (magic-pixel-fix 1)." | tee -a /dev/tty8
 	while true ; do
-		while [ $(xdotool search --name . | wc -l) -ne 3 ] && ! ps -C openbox >/dev/null ; do
+		while [ -z "$(xdotool search --class X2GoAgent)" ] && ! ps -C openbox >/dev/null ; do
 			openbox &
 			echo -en "\n$(date +'%F | %T | ')'$0' spawned OpenBox." | tee -a /dev/tty8
 		done
-		while [ $(xdotool search --name . | wc -l) -eq 3 ] && ps -C openbox >/dev/null ; do
+		while [  -n "$(xdotool search --class X2GoAgent)" ] && ps -C openbox >/dev/null ; do
 			killall openbox
 			echo -en "\n$(date +'%F | %T | ')'$0' killed OpenBox." | tee -a /dev/tty8
 		done

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git