[X2Go-Commits] [live-build-x2go] 12/95: make sure pulseaudio is responding before pacmd fires

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

commit 25e50418590f3e52757023c901b78175d9049856
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 4 17:59:08 2018 +0100

    make sure pulseaudio is responding before pacmd fires
---
 .../lib/live/config/2900-x2go-thinclientconfig     | 50 ++++++++++++----------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 28d794e..6a0e9c1 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -274,29 +274,35 @@ if [ -n "\$BLANKINGTIME" ]; then
 fi
 
 if [ -n "\$AUDIOOUT" ] ; then
-	if [ "\$AUDIOOUT" = "list" ] ; then
-		echo -en "\n\$(date +'%F | %T | ')'\$0': Available audio outputs:" | tee -a /dev/tty8
-		AUDIOOUTPUTS=\$(	for CARD in \$(pacmd list-cards | grep -A1 index | awk -F '[<> \t]' ' \$2 == "name:" { print \$4 }'); do 
-					pacmd list-cards | \
-					more +/"\$CARD" | \
-					grep -m 1 "\$CARD" -A100000 | \
-					more +/"profiles:" | \
-					grep -m 1 -B10000 "active profile:" | \
-					grep -A10000 "profiles" | \
-					grep "\W\Woutput:" | \
-					grep -v "active profile:" | \
-					awk -F'[+:]' '{gsub("\t","",\$1) ; print "\"'\$CARD'|" \$1 ":" \$2 "\""} ';
-				done | \
-				sort -u )
-		for AUDIOOUTPUT in \$AUDIOOUTPUTS; do
-			echo -en "\n\$(date +'%F | %T | ')'\$0': \$AUDIOOUTPUT" | tee -a /dev/tty8
+	(
+		while ! pacmd dump 2>&1| grep -q set-card-profile ; do
+			echo -en "\n\$(date +'%F | %T | ')'\$0': Waiting for pulseaudio to start ..." | tee -a /dev/tty8
+			sleep 1
 		done
-		echo -en "\n\$(date +'%F | %T | ')'\$0': \$(pacmd list | 'grep active profile')" | tee -a /dev/tty8
-	elif (echo "\$AUDIOOUT" | grep -q '^[^|]*|[^|]*\$') ; then
-		\$(echo "\$AUDIOOUT" | sed -e 's/^/pacmd set-card-profile /' -e 's/|/ /')
-	else
-		: # NOP
-	fi
+		if [ "\$AUDIOOUT" = "list" ] ; then
+			echo -en "\n\$(date +'%F | %T | ')'\$0': Available audio outputs:" | tee -a /dev/tty8
+			AUDIOOUTPUTS=\$(	for CARD in \$(pacmd list-cards | grep -A1 index | awk -F '[<> \t]' ' \$2 == "name:" { print \$4 }'); do 
+						pacmd list-cards | \
+						more +/"\$CARD" | \
+						grep -m 1 "\$CARD" -A100000 | \
+						more +/"profiles:" | \
+						grep -m 1 -B10000 "active profile:" | \
+						grep -A10000 "profiles" | \
+						grep "\W\Woutput:" | \
+						grep -v "active profile:" | \
+						awk -F'[+:]' '{gsub("\t","",\$1) ; print "\"'\$CARD'|" \$1 ":" \$2 "\""} ';
+					done | \
+					sort -u )
+			for AUDIOOUTPUT in \$AUDIOOUTPUTS; do
+				echo -en "\n\$(date +'%F | %T | ')'\$0': \$AUDIOOUTPUT" | tee -a /dev/tty8
+			done
+			echo -en "\n\$(date +'%F | %T | ')'\$0': \$(pacmd list | 'grep active profile')" | tee -a /dev/tty8
+		elif (echo "\$AUDIOOUT" | grep -q '^[^|]*|[^|]*\$') ; then
+			\$(echo "\$AUDIOOUT" | sed -e 's/^/pacmd set-card-profile /' -e 's/|/ /')
+		else
+			: # NOP
+		fi
+	) &
 fi
 
 eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION $DEBUGPARAMS # yes, no escape sign in front of DEBUGPARAMS, that is intentional

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