Merge lp:~hyperair/pulseaudio/fix-01Pulseaudio-quoting into lp:~ubuntu-core-dev/pulseaudio/ubuntu

[Chow Loong Jin]

Multiple fixes for 01Pulseaudio

* Drop -l from all su invocations, they cause su to do nothing.
* Fix su quoting issues:
  + Some shell functions were called within su's environment and didn't
    work.
  + Some variables were not substituted properly due to use of ' instead
    of ".

[Daniel T Chen (crimsun)]

Works fine, thanks!

review: Approve

[Daniel T Chen (crimsun)]

I just noticed that this branch can't be merged against Lucid's release due to branch skew. I updated the bzr branch a couple uploads ago to use lp:~ubuntu-core-dev/pulseaudio/ubuntu.2a. Please rebase against that branch.

[Chow Loong Jin (hyperair)]

On Monday 03,May,2010 07:47 AM, Daniel T Chen wrote:
> I just noticed that this branch can't be merged against Lucid's release due to branch skew. I updated the bzr branch a couple uploads ago to use lp:~ubuntu-core-dev/pulseaudio/ubuntu.2a. Please rebase against that branch.

Done. Please try again.

--
Kind regards,
Chow Loong Jin

[Daniel T Chen (crimsun)]

Done, thanks!

For tracking, this merge was done into maverick's ubuntu.2a.maverick branch and will be pushed into lucid's ubuntu.2a branch.

=== modified file 'debian/01PulseAudio'
--- debian/01PulseAudio	2010-01-31 18:46:06 +0000
+++ debian/01PulseAudio	2010-04-30 15:16:20 +0000
@@ -18,7 +18,7 @@
 # $1 = sink|source
 # $2 = username
 save_pulse_state_and_mute() {
-    su "${2}" -l -c -- 'pacmd list-${1}s | \
+    su "${2}" -c -- "pacmd list-${1}s" | \
         sed -n "s/^[[:space:]*]*//; /\(index\|mute\)/p" | \
         (index="";
             while read field value; do
@@ -26,33 +26,33 @@
                     index=${value}
                 else
                     savestate pulse:"${2}":${1}${index} ${value}
-                    pacmd set-${1}-mute ${index} yes
+                    su "${2}" -c -- "pacmd set-${1}-mute ${index} yes"
                 fi
-            done)'
+            done)
 }
 
 # $1 = sink|source
 # $2 = username
 restore_pulse_state() {
-    su "${2}" -l -c -- 'pacmd list-${1}s | \
+    su "${2}" -c -- "pacmd list-${1}s" | \
         sed -n "s/^[[:space:]*]*index: //p" | \
         while read index; do
             if state_exists pulse:"${2}":${1}${index}; then
-                pacmd \
+                su "${2}" -c -- "pacmd \
                     set-${1}-mute \
                     ${index} \
-                    $(restorestate pulse:"${2}":${1}${index})
+                    $(restorestate pulse:"${2}":${1}${index})"
             fi
-        done'
+        done
 }
 
 suspend_pulse() {
     for i in $(get_pulse_users); do
         THIS_USER="$(getent passwd ${i} | cut -f1 -d:)"
-        if su "${THIS_USER}" -l -c -- 'ck-list-sessions | grep "active = TRUE"' > /dev/null 2>&1; then
+        if su "${THIS_USER}" -c -- 'ck-list-sessions' | grep "active = TRUE" > /dev/null 2>&1; then
             save_pulse_state_and_mute sink "${THIS_USER}"
             save_pulse_state_and_mute source "${THIS_USER}"
-            su "${THIS_USER}" -l -c -- 'pacmd suspend true' > /dev/null 2>&1
+            su "${THIS_USER}" -c -- 'pacmd suspend true' > /dev/null 2>&1
             break
         fi
     done
@@ -61,10 +61,10 @@
 resume_pulse() {
     for i in $(get_pulse_users); do
         THIS_USER="$(getent passwd ${i} | cut -f1 -d:)"
-        if su "${THIS_USER}" -l -c -- 'ck-list-sessions | grep "active = TRUE"' > /dev/null 2>&1; then
+        if su "${THIS_USER}" -c -- 'ck-list-sessions' | grep "active = TRUE" > /dev/null 2>&1; then
             restore_pulse_state sink "${THIS_USER}"
             restore_pulse_state source "${THIS_USER}"
-            su "${THIS_USER}" -l -c -- 'pacmd suspend false' > /dev/null 2>&1
+            su "${THIS_USER}" -c -- 'pacmd suspend false' > /dev/null 2>&1
             break
         fi
     done