diff --git a/scripts/core/sxmo_audiooutmenu.sh b/scripts/core/sxmo_audiooutmenu.sh index c6a75c6..b08e7a3 100755 --- a/scripts/core/sxmo_audiooutmenu.sh +++ b/scripts/core/sxmo_audiooutmenu.sh @@ -2,10 +2,9 @@ pidof svkbd-sxmo || svkbd-sxmo & OUTINPUT="$( -echo "speaker -headphones -earpiece -none +echo "Speaker +Headphones +Earpiece Close Menu" | dmenu -p "Audio Out" -c -fn "Terminus-30" -l 20 )" @@ -16,15 +15,15 @@ SPEAKER="Line Out" HEADPHONE="Headphone" EARPIECE="Earpiece" -amixer set "$SPEAKER" mute > /dev/null -amixer set "$HEADPHONE" mute > /dev/null -amixer set "$EARPIECE" mute > /dev/null +amixer set "$SPEAKER" mute +amixer set "$HEADPHONE" mute +amixer set "$EARPIECE" mute -if [[ "$OUTINPUT" = "speaker" ]]; then - amixer set "$SPEAKER" unmute > /dev/null -elif [[ "$OUTINPUT" = "headphones" ]]; then - amixer set "$HEADPHONE" unmute > /dev/null -elif [[ "$OUTINPUT" = "earpiece" ]]; then - amixer set "$EARPIECE" unmute > /dev/null +if [[ "$OUTINPUT" = "Speaker" ]]; then + amixer set "$SPEAKER" unmute +elif [[ "$OUTINPUT" = "Headphones" ]]; then + amixer set "$HEADPHONE" unmute +elif [[ "$OUTINPUT" = "Earpiece" ]]; then + amixer set "$EARPIECE" unmute fi diff --git a/scripts/core/sxmo_statusbar.sh b/scripts/core/sxmo_statusbar.sh index d4852d8..1e75979 100755 --- a/scripts/core/sxmo_statusbar.sh +++ b/scripts/core/sxmo_statusbar.sh @@ -2,8 +2,9 @@ pgrep -f sxmo_statusbar.sh | grep -v $$ | xargs kill -9 audiodevice() { - amixer sget Earpiece | grep -E [[]on[]] && echo Earpiece > /dev/null && return - amixer sget Headphone > /dev/null && echo Headphone || echo Speaker + amixer sget Earpiece | grep -E '\[on\]' > /dev/null && echo Earpiece && return + amixer sget Headphone | grep -E '\[on\]' > /dev/null && echo Headphone && return + echo "Line Out" } sleep 1 @@ -25,7 +26,7 @@ do # Volume VOL=$( - echo "$(amixer sget $(audiodevice))" | + echo "$(amixer sget "$(audiodevice)")" | grep -oE '([0-9]+)%' | tr -d ' %' | awk '{ s += $1; c++ } END { print s/c }' | @@ -40,4 +41,4 @@ do inotifywait -e MODIFY $UPDATEFILE & sleep 30 & wait -n pgrep -P $$ | xargs kill -9 -done \ No newline at end of file +done diff --git a/scripts/core/sxmo_vol.sh b/scripts/core/sxmo_vol.sh index 7292789..7b1e581 100755 --- a/scripts/core/sxmo_vol.sh +++ b/scripts/core/sxmo_vol.sh @@ -1,7 +1,8 @@ #!/usr/bin/env sh device() { - amixer sget Earpiece | grep -E '[[]on[]]' > /dev/null && echo Earpiece && return - amixer sget Headphone > /dev/null && echo Headphone || echo "Line Out" + amixer sget Earpiece | grep -E '\[on\]' > /dev/null && echo Earpiece && return + amixer sget Headphone | grep -E '\[on\]' > /dev/null && echo Headphone && return + echo "Line Out" } notify() {