~mil/sxmo-utils

a032e4923eaaa1e532e52cd8c4b7d676ecffb554 — Miles Alan 1 year, 5 months ago 9f930e7
Remove +1 stripping from numbers in modem scripts

Note prefix stripping was unreliable because any +1XX number would break things.
The advice should be to always dial with +1 / international prefixes and store
contacts in your contacts.tsv with international codes; this way we avoid any
duplicate errors since we can be assured things in mmcli always come back w/
international prefixing automatically.
M scripts/modem/sxmo_modemcall.sh => scripts/modem/sxmo_modemcall.sh +1 -3
@@ 34,9 34,7 @@ vid_to_number() {
	mmcli -m "$(modem_n)" -o "$1" -K | 
	grep call.properties.number | 
	cut -d ':' -f2 | 
	tr -d  ' ' | 
	sed 's/^[+]//' |
	sed 's/^1//'
	tr -d  ' '
}

log_event() {

M scripts/modem/sxmo_modemdial.sh => scripts/modem/sxmo_modemdial.sh +1 -6
@@ 25,12 25,7 @@ dialmenu() {
	)"
	echo "$NUMBER" | grep "Close Menu" && kill 0

	NUMBER="$(
		echo "$NUMBER" | 
		awk -F' ' '{print $NF}' |
		tr -d - |
		cut -f2
	)"
	NUMBER="$(echo "$NUMBER" | cut -d: -f1 tr -d '- ')"
	echo "$NUMBER" | grep -qE '^[+0-9]+$' || fatalerr "$NUMBER is not a number"

	echo "Attempting to dial: $NUMBER" >&2

M scripts/modem/sxmo_modemmonitor.sh => scripts/modem/sxmo_modemmonitor.sh +2 -5
@@ 50,8 50,7 @@ checkforincomingcalls() {
		mmcli -m "$(modem_n)" --voice-list-calls -o "$VOICECALLID" -K |
		grep call.properties.number |
		cut -d ':' -f 2 |
		sed 's/^[+]//' | 
		sed 's/^1//'
		tr -d ' '
	)

	# Log to /tmp/incomingcall to allow pickup and log into modemlog


@@ 86,9 85,7 @@ checkfornewtexts() {
		NUM="$(
			echo "$TEXTDATA" | 
			grep sms.content.number | 
			sed -E 's/^sms\.content\.number\s+:\s+[+]?//' |
			sed 's/^[+]//' |
			sed 's/^1//'
			sed -E 's/^sms\.content\.number\s+:\s+[+]?//'
		)"
		TIME="$(echo "$TEXTDATA" | grep sms.properties.timestamp | sed -E 's/^sms\.properties\.timestamp\s+:\s+//')"


M scripts/modem/sxmo_modemtext.sh => scripts/modem/sxmo_modemtext.sh +1 -1
@@ 22,7 22,7 @@ editmsg() {

sendmsg() {
	MODEM="$(modem_n)"
	NUMBER="$(echo "$1" | sed 's/^[+]//' | sed 's/^1//')"
	NUMBER="$1"
	TEXT="$2"
	TEXTSIZE="${#TEXT}"