jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix short phone numbers or phone numbers with text do not appear in scripts

Browse source 
Fixes #106

Signed-off-by: Anjandev Momi <anjan@momi.ca>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Anjandev Momi 2020-12-04 04:10:13 +00:00 • committed by Maarten van Gompel
parent b0bb9ac9fc
commit 741defe781
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/core/sxmo_contacts.sh
View file

@ -16,14 +16,14 @@ contacts() {
RECENTCONTACTEDNUMBERSREVCHRON="$( RECENTCONTACTEDNUMBERSREVCHRON="$(
cut -f3 "$LOGFILE" | cut -f3 "$LOGFILE" |
tac | tac |
awk '!($0 in a){a[$0]; if (substr($0,1,1) == "+") print}' | awk '!($0 in a){a[$0]; print}' |
sed '/^[[:space:]]*$/d' sed '/^[[:space:]]*$/d'
)" )"
printf %b "$RECENTCONTACTEDNUMBERSREVCHRON" | awk -F'\t' ' printf %b "$RECENTCONTACTEDNUMBERSREVCHRON" | awk -F'\t' '
FNR==NR{a[$1]=$2; next} FNR==NR{a[$1]=$2; next}
{ {
if (!a[$1]) a[$1] = "Unknown Number"; if (!a[$1]) a[$1] = "Unknown Number";
if (substr($0,1,1) == "+") print $0 ": " a[$1] print $0 ": " a[$1]
} }
' "$CONTACTSFILE" - ' "$CONTACTSFILE" -
} }

10
scripts/modem/sxmo_modemmonitor.sh
View file

@ -46,7 +46,7 @@ checkformissedcalls() {
mkdir -p "$LOGDIR" mkdir -p "$LOGDIR"
printf %b "$TIME\tcall_missed\t$MISSEDNUMBER\n" >> "$LOGDIR/modemlog.tsv" printf %b "$TIME\tcall_missed\t$MISSEDNUMBER\n" >> "$LOGDIR/modemlog.tsv"
CONTACT="$(sxmo_contacts.sh | grep -E "^\\$MISSEDNUMBER")" CONTACT="$(sxmo_contacts.sh | grep -F "^${MISSEDNUMBER//+/\\+}:")"
sxmo_notificationwrite.sh \ sxmo_notificationwrite.sh \
random \ random \
"st -f Terminus-20 -e sh -c \"echo 'Missed call from $CONTACT at $(date)' && read\"" \ "st -f Terminus-20 -e sh -c \"echo 'Missed call from $CONTACT at $(date)' && read\"" \
@ -69,7 +69,7 @@ checkforincomingcalls() {
INCOMINGNUMBER=$(lookupnumberfromcallid "$VOICECALLID") INCOMINGNUMBER=$(lookupnumberfromcallid "$VOICECALLID")
if [ -x "$XDG_CONFIG_HOME/sxmo/hooks/ring" ]; then if [ -x "$XDG_CONFIG_HOME/sxmo/hooks/ring" ]; then
"$XDG_CONFIG_HOME/sxmo/hooks/ring" "$(sxmo_contacts.sh | grep -E "^\\$INCOMINGNUMBER")" & "$XDG_CONFIG_HOME/sxmo/hooks/ring" "$(sxmo_contacts.sh | grep -E "^${INCOMINGNUMBER//+/\\+}:")" &
else else
sxmo_vibratepine 2500 & sxmo_vibratepine 2500 &
fi fi
@ -82,7 +82,7 @@ checkforincomingcalls() {
"$NOTIFDIR/incomingcall_${VOICECALLID}_notification" \ "$NOTIFDIR/incomingcall_${VOICECALLID}_notification" \
"sxmo_modemcall.sh pickup $VOICECALLID" \ "sxmo_modemcall.sh pickup $VOICECALLID" \
none \ none \
"Pickup - $(sxmo_contacts.sh | grep -E "^\\$INCOMINGNUMBER")" & "Pickup - $(sxmo_contacts.sh | grep -E "^${INCOMINGNUMBER//+/\\+}:")" &
echo "Number: $INCOMINGNUMBER (VOICECALLID: $VOICECALLID)" echo "Number: $INCOMINGNUMBER (VOICECALLID: $VOICECALLID)"
} }
@ -115,10 +115,10 @@ checkfornewtexts() {
random \ random \
"st -e tail -n9999 -f '$LOGDIR/$NUM/sms.txt'" \ "st -e tail -n9999 -f '$LOGDIR/$NUM/sms.txt'" \
"$LOGDIR/$NUM/sms.txt" \ "$LOGDIR/$NUM/sms.txt" \
"Message - $(sxmo_contacts.sh | grep -E "^\\$NUM"): $TEXT" "Message - $(sxmo_contacts.sh | grep -E "^${NUM//+/\\+}:"): $TEXT"
if [ -x "$XDG_CONFIG_HOME/sxmo/hooks/sms" ]; then if [ -x "$XDG_CONFIG_HOME/sxmo/hooks/sms" ]; then
"$XDG_CONFIG_HOME/sxmo/hooks/sms" "$(sxmo_contacts.sh | grep -E "^\\$NUM")" "$TEXT" "$XDG_CONFIG_HOME/sxmo/hooks/sms" "$(sxmo_contacts.sh | grep -E "^${NUM//+/\\+}:")" "$TEXT"
fi fi
done done
} }