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

Fix sxmo_modemtext in terminal mode

Browse source 
As we rely on the terminal name to use the contextual menu, we used the
st target directly, preventing to use the taillog command in terminal
mode.

Add an optional TERMNAME env variable to manage this smoothly.

Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Stacy Harper 2021-06-17 19:01:47 +02:00 • committed by Maarten van Gompel
parent e428d0c4a4
commit 60dd08fa27
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/core/sxmo_terminal.sh
View file

@ -1,7 +1,18 @@
#!/usr/bin/env sh
# shellcheck disable=SC2086
set -- $TERMCMD "$@"
if [ -n "$TERMNAME" ]; then
case "$TERMCMD" in
"st -e")
set -- st -T "$TERMNAME" -e "$@"
;;
*)
printf "%s: '%s'\n" "Not implemented for TERMCMD" "$TERMCMD" >&2
set -- $TERMCMD "$@"
esac
else
set -- $TERMCMD "$@"
fi
if [ -z "$*" ]; then
echo "sxmo_terminal.sh called in TERMMODE without any arguments (returning, nothing to do)" >&2

2
scripts/modem/sxmo_modemtext.sh
View file

@ -76,7 +76,7 @@ tailtextlog() {
CONTACTNAME="$(sxmo_contacts.sh | grep "^$NUMBER" | cut -d' ' -f2-)"
[ "Unknown Number" = "$CONTACTNAME" ] && CONTACTNAME="$CONTACTNAME ($NUMBER)"
st -T "$NUMBER SMS" -e sh -c "tail -n9999 -f \"$LOGDIR/$NUMBER/sms.txt\" | sed \"s|$NUMBER|$CONTACTNAME|g\""
TERMNAME="$NUMBER SMS" sxmo_terminal.sh sh -c "tail -n9999 -f \"$LOGDIR/$NUMBER/sms.txt\" | sed \"s|$NUMBER|$CONTACTNAME|g\""
}
readtextmenu() {