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 198ae88f3ebead776cadf504e34011bfd8394c14 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Dec 16 02:32:37 2018 +0100 added logging to file for audioout=list, plus some whitespace fixes/formatting --- .../etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 157cbb6..bbaf2d8 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 @@ -3,7 +3,7 @@ if ! ps -C pulseaudio >/dev/null ; then pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & 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.:_\-@|') +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.:_\-@|') if [ -n "$AUDIOOUT" ] ; then ( @@ -12,16 +12,16 @@ if [ -n "$AUDIOOUT" ] ; then sleep 1 done if [ "$AUDIOOUT" = "list" ] ; then - echo -en "\n$(date +'%F | %T | ')'$0': Available audio outputs:" | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0': Available audio outputs:" | tee -a /dev/tty8 | tee -a /tmp/audiolog 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" | gre -p "\W\Woutput:" | grep -v "active profile:" | awk -F'[+:]' '{gsub("\t","",$1) ; print "\"'$CARD'|" $1 ":" $2 "\""} '; - done | sort -u ) + 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 + echo -en "\n$(date +'%F | %T | ')'$0': $AUDIOOUTPUT" | tee -a /dev/tty8 | tee -a /tmp/audiolog done - echo -en "\n$(date +'%F | %T | ')'$0': $(pacmd list | 'grep active profile')" | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0': $(pacmd list | 'grep active profile')" | tee -a /dev/tty8 | tee -a /tmp/audiolog elif (echo "$AUDIOOUT" | grep -q '^[^|]*|[^|]*$') ; then $(echo "$AUDIOOUT" | sed -e 's/^/pacmd set-card-profile /' -e 's/|/ /') else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git