From 2d9740f252756e51cbc6f6553663d06edf627b53 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 23 Apr 2021 20:08:45 -0700 Subject: [PATCH] sxmo_audio*: properly set vars with default values if they are unset A mistake from implementing this resulted in the shell trying to expand the 'word' part (e.g. "Line Out"), when the var was unset or null. Obviously those are are strings and not expandable. Signed-off-by: Anjandev Momi --- scripts/core/sxmo_audiocurrentdevice.sh | 6 +++--- scripts/core/sxmo_audioout.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/core/sxmo_audiocurrentdevice.sh b/scripts/core/sxmo_audiocurrentdevice.sh index ddef734..f3e3134 100755 --- a/scripts/core/sxmo_audiocurrentdevice.sh +++ b/scripts/core/sxmo_audiocurrentdevice.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh -${SPEAKER:-"Line Out"} -${HEADPHONE:-"Headphone"} -${EARPIECE:-"Earpiece"} +SPEAKER=${SPEAKER:-"Line Out"} +HEADPHONE=${HEADPHONE:-"Headphone"} +EARPIECE=${EARPIECE:-"Earpiece"} audiodevice() { amixer sget "$EARPIECE" | grep -qE '\[on\]' && echo "$EARPIECE" && return diff --git a/scripts/core/sxmo_audioout.sh b/scripts/core/sxmo_audioout.sh index 310f307..a06e9b8 100755 --- a/scripts/core/sxmo_audioout.sh +++ b/scripts/core/sxmo_audioout.sh @@ -5,9 +5,9 @@ ARG="$1" # shellcheck source=scripts/core/sxmo_common.sh . "$(dirname "$0")/sxmo_common.sh" -${SPEAKER:-"Line Out"} -${HEADPHONE:-"Headphone"} -${EARPIECE:-"Earpiece"} +SPEAKER="${SPEAKER:-"Line Out"}" +HEADPHONE="${HEADPHONE:-"Headphone"}" +EARPIECE="${EARPIECE:-"Earpiece"}" amixer set "$SPEAKER" mute amixer set "$HEADPHONE" mute