projects
/
grml-autoconfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8522247
)
Remove subshells in config_mixer for the tests.
author
Ulrich Dangel
<mru@grml.org>
Fri, 23 Dec 2011 01:05:33 +0000
(
02:05
+0100)
committer
Michael Prokop
<mika@grml.org>
Fri, 23 Dec 2011 01:09:48 +0000
(
02:09
+0100)
autoconfig.functions
patch
|
blob
|
history
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
a5a5507
..
d8856e9
100755
(executable)
--- 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
'
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
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
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 $?
amixer -c $card -q set "${CONTROL}" $MICVOL%
fi
eend $?