summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2014-10-01 18:59:38 +0200
committerJonathan Bauer2014-10-01 18:59:38 +0200
commitf4ab3a09fd66665c97fa902c3e6b75a4c02f0a66 (patch)
treed7ca8c0be96c5466fe2c2d535adbbd1e9863d4db
parent[vm*] set default sound card for vmware instead of using auto-detect (diff)
downloadtm-scripts-f4ab3a09fd66665c97fa902c3e6b75a4c02f0a66.tar.gz
tm-scripts-f4ab3a09fd66665c97fa902c3e6b75a4c02f0a66.tar.xz
tm-scripts-f4ab3a09fd66665c97fa902c3e6b75a4c02f0a66.zip
[vmchooser] fix eventual spaces in SOUND_CARD_INDEX
-rwxr-xr-xremote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt3
-rwxr-xr-xremote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt3
2 files changed, 6 insertions, 0 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 2f3a9403..633f80a2 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -456,6 +456,9 @@ if true; then
fi
fi
+ SOUND_CARD_INDEX="$(grep -E -o '[0-9]+' <<<$SOUND_CARD_INDEX)"
+ echo "Detected sound card index is: $SOUND_CARD_INDEX"
+
# Adjust sound volume (playback)... Random mixer names we have encountered during testing
echo "Setting up volume..."
amixer -q -c "$SOUND_CARD_INDEX" sset 'Master' "$VOL" unmute
diff --git a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
index 2f3a9403..633f80a2 100755
--- a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
@@ -456,6 +456,9 @@ if true; then
fi
fi
+ SOUND_CARD_INDEX="$(grep -E -o '[0-9]+' <<<$SOUND_CARD_INDEX)"
+ echo "Detected sound card index is: $SOUND_CARD_INDEX"
+
# Adjust sound volume (playback)... Random mixer names we have encountered during testing
echo "Setting up volume..."
amixer -q -c "$SOUND_CARD_INDEX" sset 'Master' "$VOL" unmute