[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. d0256ed89f5fc785f2726d6c4a12593b548ed997

[Darren Salt]

The following commit has been merged in the master branch:
commit 348046892d1fd33f2748fb98bcb11e18779354f3
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Wed Feb 4 18:07:45 2009 +0000

    Cope with the possible presence of mixer control names which contain spaces.

diff --git a/debian/eeepc-acpi-scripts.default b/debian/eeepc-acpi-scripts.default
index 2e1d15b..900b828 100644
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@ -8,9 +8,12 @@ OSD_FONT='DejaVuSans 36'
 ENABLE_OSD_BRIGHTNESS='no'
 
 # Leave these empty to attempt to autoconfigure. If they don't work for you
-# lookup the following values by using amixer; separate multiple values with a
-# blank space and enclose all the values with quotation marks:
-# devices with pvolume capabilities:
+# lookup the following values by using amixer; one control name per line,
+# and enclose them all in *one* pair of single quotation marks, e.g.
+# SOUND_LABEL='PCM
+# LineOut'
+#
+# controls with pvolume capabilities:
 SOUND_LABEL=
 # pswitch capabilities:
 SOUND_SWITCH=
diff --git a/etc/acpi/actions/volume.sh b/etc/acpi/actions/volume.sh
index ecde664..228557d 100755
--- a/etc/acpi/actions/volume.sh
+++ b/etc/acpi/actions/volume.sh
@@ -69,6 +69,10 @@ show_volume() {
     notify audio "Volume $msg" fast
 }
 
+# cope with control names which contain spaces
+IFS='
+'
+
 case "$action" in
     toggle)
         for label in $SOUND_SWITCH; do

-- 
Maintenance of eeepc-acpi-scripts debian package