[X2Go-Commits] [live-build-x2go] 91/108: added some sanity checks and debug output

[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
in repository live-build-x2go.

commit 6cbb3bab42601f76c00b871ecc59d23378e33a70
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Jan 19 19:18:38 2019 +0000

    added some sanity checks and debug output
---
 config/includes.chroot/etc/X11/Xsession.d/60x11-openbox-start     | 8 ++++++--
 .../etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio           | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-openbox-start b/config/includes.chroot/etc/X11/Xsession.d/60x11-openbox-start
index 9835ae9..d8f59ca 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-openbox-start
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-openbox-start
@@ -1,4 +1,8 @@
 # Spawn openbox
-openbox &
-echo -en "\n$(date +'%F | %T | ')'$0' spawned OpenBox." | tee -a /dev/tty8
+if [ -x /usr/bin/openbox ] ; then
+	openbox &
+	echo -en "\n$(date +'%F | %T | ')'$0' spawned OpenBox." | tee -a /dev/tty8
+else
+	echo -en "\n$(date +'%F | %T | ')'$0' Not spawning OpenBox - executable not found. (MiniDesktop active?)" | tee -a /dev/tty8
+fi
 
diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio
index bbaf2d8..6331469 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio
@@ -1,6 +1,9 @@
 # Spawn PulseAudio
-if ! ps -C pulseaudio >/dev/null ; then
+if ! ps -C pulseaudio >/dev/null && [ -x /usr/bin/pulseaudio ] ; then
 	pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 &
+	echo -en "\n$(date +'%F | %T | ')'$0' spawned PulseAudio." | tee -a /dev/tty8
+else
+	echo -en "\n$(date +'%F | %T | ')'$0' Not spawning Pulseaudio - already running (MiniDesktop active?) or executable not found." | tee -a /dev/tty8
 fi
 
 AUDIOOUT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F'=' ' /^audioout=/ { print $2 }' | tr -dc 'a-zA-Z0-9.:_\-@|')

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