[X2Go-Commits] [live-build-x2go] 13/108: make sure pulseaudio is responding before pacmd fires
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 20 22:13:05 CET 2019
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 7658766773782faab77ad8a41055ef9529c7ce26
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Sun Feb 4 17:57:15 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 ccc5360..6939b68 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -237,29 +237,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
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list