no need for number validation when cancelling dialer

master
Maarten van Gompel 4 years ago
parent 236ab9a343
commit 031bb9de21
  1. 11
      scripts/modem/sxmo_modemdial.sh

@ -30,7 +30,12 @@ dialmenu() {
sxmo_dmenu_with_kb.sh -l 10 -p Number -c -fn Terminus-20 -i sxmo_dmenu_with_kb.sh -l 10 -p Number -c -fn Terminus-20 -i
)" )"
NUMBER="$(echo "$NUMBER" | cut -d: -f1 | tr -d -- '- ')" NUMBER="$(echo "$NUMBER" | cut -d: -f1 | tr -d -- '- ')"
echo "$NUMBER" | grep -qE '^[+0-9]+$' || fatalerr "$NUMBER is not a number" if [ -z "$NUMBER" ] || [ "$NUMBER" = "CloseMenu" ]; then
#no number selected (probably cancelled), silently discard
exit 0
else
echo "$NUMBER" | grep -qE '^[+0-9]+$' || fatalerr "$NUMBER is not a number"
fi
echo "Attempting to dial: $NUMBER" >&2 echo "Attempting to dial: $NUMBER" >&2
CALLID="$( CALLID="$(
@ -44,4 +49,6 @@ dialmenu() {
modem_n || fatalerr "Couldn't determine modem number - is modem online?" modem_n || fatalerr "Couldn't determine modem number - is modem online?"
CREATEDCALLID="$(dialmenu)" CREATEDCALLID="$(dialmenu)"
sxmo_modemcall.sh pickup "$CREATEDCALLID" if [ ! -z "$CREATEDCALLID" ]; then
sxmo_modemcall.sh pickup "$CREATEDCALLID"
fi

Loading…
Cancel
Save