From 0fb12569f53c7baff0e526b7ca62ed1c2dca5cba Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Fri, 23 Dec 2011 02:05:33 +0100 Subject: [PATCH] Remove subshells in config_mixer for the tests. --- autoconfig.functions | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index a5a5507..d8856e9 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1177,19 +1177,19 @@ config_mixer () { ' for CONTROL in ${=CONTROLS} ; do if ! echo "${CONTROL}" | grep -q -i "mic" ; then - if $(amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*pswitch') ; then - amixer -c $card -q set "${CONTROL}" unmute - fi - if $(amixer -c $card sget "${CONTROL}" | grep -q -P 'Capabilities:.*(pvolume| volume)') ; then - amixer -c $card -q set "${CONTROL}" "${VOL}"% - fi + if amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*pswitch' ; then + amixer -c $card -q set "${CONTROL}" unmute + fi + if amixer -c $card sget "${CONTROL}" | grep -q -P 'Capabilities:.*(pvolume| volume)' ; then + amixer -c $card -q set "${CONTROL}" "${VOL}"% + fi fi if [ ${MICVOL} -ne 0 ] ; then - if $(amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*cswitch') ; then + if amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*cswitch' ; then amixer -c $card -q set "${CONTROL}" unmute fi - if $(amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*cvolume') ; then + if amixer -c $card sget "${CONTROL}" | grep -q 'Capabilities:.*cvolume' ; then amixer -c $card -q set "${CONTROL}" $MICVOL% fi eend $? -- 2.1.4