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

Only show entries to text for directories that exist; fix number bugs

Browse source
This commit is contained in:
Miles Alan 2020-06-29 12:57:42 -05:00
parent 917ad2ebfe
commit e3f50e9d1b
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/modem/sxmo_modemdial.sh
View file

@ -1,5 +1,4 @@
#!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
trap "gracefulexit" INT TERM
fatalerr() {
@ -25,7 +24,7 @@ dialmenu() {
)"
echo "$NUMBER" | grep "Close Menu" && kill 0
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"
echo "Attempting to dial: $NUMBER" >&2

22
scripts/modem/sxmo_modemtext.sh
View file

@ -48,12 +48,14 @@ sendtextmenu() {
# Prompt for number
NUMBER="$(
printf %b "\nCancel\n$(textcontacts)" |
printf %b "\nCancel\n$(sxmo_contacts.sh)" |
awk NF |
sxmo_dmenu_with_kb.sh -p "Number" -fn "Terminus-20" -l 10 -c
sxmo_dmenu_with_kb.sh -p "Number" -fn "Terminus-20" -l 10 -c |
cut -d: -f1 |
tr -d -- '- '
)"
echo "$NUMBER" | grep -E "^Cancel$" && exit 1
echo "$NUMBER" | grep -E '[0-9]+' || err "That doesn't seem like a valid number"
echo "$NUMBER" | grep -qE '^[+0-9]+$' || err "That doesn't seem like a valid number"
# Compose first version of msg
TEXT="$(editmsg "$NUMBER" 'Enter text message here')"
@ -75,13 +77,19 @@ tailtextlog() {
}
main() {
# Display
ENTRIES="$(printf %b "$(sxmo_contacts.sh)" | xargs -INUM echo NUM logfile)"
ENTRIES="$(printf %b "Close Menu\nSend a Text\n$ENTRIES")"
# E.g. only display logfiles for directories that exist and join w contact name
ENTRIES="$(
printf %b "Close Menu\nSend a Text\n";
for TDIR in "$LOGDIR"/*; do
[ -d "$TDIR" ] || continue
NUM="$(basename "$TDIR")"
sxmo_contacts.sh | grep -m1 "$NUM" | xargs -IL echo "L logfile"
done
)"
CONTACTIDANDNUM="$(printf %b "$ENTRIES" | dmenu -p Texts -c -fn Terminus-20 -l 10)"
echo "$CONTACTIDANDNUM" | grep "Close Menu" && exit 1
echo "$CONTACTIDANDNUM" | grep "Send a Text" && sendtextmenu && exit 1
tailtextlog "$(echo "$CONTACTIDANDNUM" | grep -Eo "[0-9]{3,}")"
tailtextlog "$(echo "$CONTACTIDANDNUM" | cut -d: -f1)"
}
main