Fix shellcheck errors

master
Miles Alan 5 years ago
parent 7f31a3da40
commit bd5ead19e5
  1. 59
      scripts/modem/sxmo_modemcall.sh
  2. 2
      scripts/modem/sxmo_modeminfo.sh

@ -1,44 +1,43 @@
#!/usr/bin/env sh #!/usr/bin/env sh
PID=$$
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
trap "kill 0" SIGINT trap "kill 0" INT
err() { err() {
echo -e "$1" | dmenu -fn Terminus-20 -c -l 10 printf %b "$1" | dmenu -fn Terminus-20 -c -l 10
alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore
kill -9 0 kill -9 0
} }
modem_n() { modem_n() {
MODEMS="$(mmcli -L)" MODEMS="$(mmcli -L)"
echo "$MODEMS" | grep -oE 'Modem\/([0-9]+)' > /dev/null || err "Couldn't find modem - is your modem enabled?" echo "$MODEMS" | grep -qoE 'Modem\/([0-9]+)' || err "Couldn't find modem - is your modem enabled?"
echo "$MODEMS" | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2 echo "$MODEMS" | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2
} }
contacts() { contacts() {
RES="$(cat $LOGDIR/modemlog.tsv | cut -f3 | sort | uniq | awk NF)" RES="$(cut -f3 "$LOGDIR/modemlog.tsv" | sort | uniq | awk NF)"
echo "$RES" echo "$RES"
echo -e "$RES" | grep 8042221111 > /dev/null || echo "Test Number 8042221111" printf %b "$RES" | grep -q 8042221111 || echo "Test Number 8042221111"
} }
modem_cmd_errcheck() { modem_cmd_errcheck() {
ARGS="$@" ARGS="$@"
RES="$(mmcli $ARGS 2>&1)" RES="$(mmcli $ARGS 2>&1)"
[[ $? -eq 0 ]] || err "Problem executing mmcli command!\n$RES" [ $? -eq 0 ] || err "Problem executing mmcli command!\n$RES"
echo $RES echo "$RES"
} }
vid_to_number() { vid_to_number() {
mmcli -m $(modem_n) -o $1 -K | grep call.properties.number | cut -d ':' -f2 | tr -d ' ' | sed 's/^[+]//' | sed 's/^1//' mmcli -m "$(modem_n)" -o "$1" -K | grep call.properties.number | cut -d ':' -f2 | tr -d ' ' | sed 's/^[+]//' | sed 's/^1//'
} }
log_event() { log_event() {
EVT_HANDLE="$1" EVT_HANDLE="$1"
EVT_VID="$2" EVT_VID="$2"
NUM="$(vid_to_number $EVT_VID)" NUM="$(vid_to_number "$EVT_VID")"
TIME="$(date --iso-8601=seconds)" TIME="$(date --iso-8601=seconds)"
mkdir -p $LOGDIR mkdir -p "$LOGDIR"
echo -ne "$TIME\t$EVT_HANDLE\t$NUM\n" >> $LOGDIR/modemlog.tsv printf %b "$TIME\t$EVT_HANDLE\t$NUM\n" >> "$LOGDIR/modemlog.tsv"
} }
toggleflag() { toggleflag() {
@ -53,7 +52,7 @@ toggleflag() {
NEWFLAGS="$(echo -- "$NEWFLAGS" | sed "s/--//g; s/ / /g")" NEWFLAGS="$(echo -- "$NEWFLAGS" | sed "s/--//g; s/ / /g")"
sxmo_megiaudioroute $NEWFLAGS sxmo_megiaudioroute $NEWFLAGS
echo -- $NEWFLAGS echo -- "$NEWFLAGS"
} }
toggleflagset() { toggleflagset() {
@ -64,28 +63,30 @@ toggleflagset() {
dialmenu() { dialmenu() {
CONTACTS="$(contacts)" CONTACTS="$(contacts)"
NUMBER="$( NUMBER="$(
echo -e "Close Menu\n$CONTACTS" | printf %b "Close Menu\n$CONTACTS" |
grep . | grep . |
sxmo_dmenu_with_kb.sh -l 10 -p Number -c -fn Terminus-20 sxmo_dmenu_with_kb.sh -l 10 -p Number -c -fn Terminus-20
)" )"
echo "$NUMBER" | grep "Close Menu" && kill 0 echo "$NUMBER" | grep "Close Menu" && kill 0
NUMBER="$(echo $NUMBER | awk -F' ' '{print $NF}' | tr -d -)" NUMBER="$(echo "$NUMBER" | awk -F' ' '{print $NF}' | tr -d -)"
echo "$NUMBER" | grep -E '^[0-9]+$'> /dev/null || err "$NUMBER is not a number" echo "$NUMBER" | grep -qE '^[0-9]+$' || err "$NUMBER is not a number"
echo "Attempting to dial: $NUMBER" >&2 echo "Attempting to dial: $NUMBER" >&2
VID="$( VID="$(
mmcli -m $(modem_n) --voice-create-call "number=$NUMBER" | grep -Eo Call/[0-9]+ | grep -oE [0-9]+ mmcli -m "$(modem_n)" --voice-create-call "number=$NUMBER" |
grep -Eo "Call/[0-9]+" |
grep -oE "[0-9]+"
)" )"
echo "Starting call with VID: $VID" >&2 echo "Starting call with VID: $VID" >&2
startcall $VID >&@ startcall "$VID" >&@
echo $VID echo "$VID"
} }
startcall() { startcall() {
VID="$1" VID="$1"
#modem_cmd_errcheck --voice-status -o $VID #modem_cmd_errcheck --voice-status -o $VID
modem_cmd_errcheck -m $(modem_n) -o $VID --start modem_cmd_errcheck -m "$(modem_n)" -o "$VID" --start
log_event "call_start" "$VID" log_event "call_start" "$VID"
} }
@ -93,14 +94,14 @@ acceptcall() {
VID="$1" VID="$1"
echo "Attempting to pickup VID $VID" echo "Attempting to pickup VID $VID"
#mmcli --voice-status -o $VID #mmcli --voice-status -o $VID
modem_cmd_errcheck -m $(modem_n) -o $VID --accept modem_cmd_errcheck -m "$(modem_n)" -o "$VID" --accept
log_event "call_pickup" $VID log_event "call_pickup" "$VID"
} }
hangup() { hangup() {
VID=$1 VID="$1"
modem_cmd_errcheck -m $(modem_n) -o $VID --hangup modem_cmd_errcheck -m "$(modem_n)" -o "$VID" --hangup
log_event "call_hangup" $VID log_event "call_hangup" "$VID"
err "Call hungup ok" err "Call hungup ok"
exit 1 exit 1
} }
@ -108,7 +109,7 @@ hangup() {
incallmenu() { incallmenu() {
DMENUIDX=0 DMENUIDX=0
VID="$1" VID="$1"
NUMBER="$(vid_to_number $VID)" NUMBER="$(vid_to_number "$VID")"
# E.g. There's some bug with the modem that' requires us to toggle the # E.g. There's some bug with the modem that' requires us to toggle the
# DAI a few times before starting the call for it to kick in # DAI a few times before starting the call for it to kick in
@ -155,7 +156,7 @@ incallmenu() {
} }
dtmfmenu() { dtmfmenu() {
VID=$1 VID="$1"
DTMFINDEX=0 DTMFINDEX=0
NUMS="0123456789*#ABCD" NUMS="0123456789*#ABCD"
@ -167,13 +168,13 @@ dtmfmenu() {
)" )"
echo "$PICKED" | grep "Return to Call Menu" && return echo "$PICKED" | grep "Return to Call Menu" && return
DTMFINDEX=$(echo "$NUMS" | grep -bo "$PICKED" | cut -d: -f1 | xargs -IN echo 2+N | bc) DTMFINDEX=$(echo "$NUMS" | grep -bo "$PICKED" | cut -d: -f1 | xargs -IN echo 2+N | bc)
modem_cmd_errcheck -m $(modem_n) -o $VID --send-dtmf="$PICKED" modem_cmd_errcheck -m "$(modem_n)" -o "$VID" --send-dtmf="$PICKED"
done done
} }
dial() { dial() {
VID="$(dialmenu)" VID="$(dialmenu)"
incallmenu $VID incallmenu "$VID"
} }
pickup() { pickup() {

@ -1,7 +1,7 @@
#!/usr/bin/env sh #!/usr/bin/env sh
err() { err() {
echo -e "$1" | dmenu -fn Terminus-20 -c -l 10 printf %b "$1" | dmenu -fn Terminus-20 -c -l 10
exit exit
} }

Loading…
Cancel
Save