Fix sxmo_modemtext in terminal mode

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>
master
Stacy Harper 3 years ago committed by Maarten van Gompel
parent e428d0c4a4
commit 60dd08fa27
  1. 15
      scripts/core/sxmo_terminal.sh
  2. 2
      scripts/modem/sxmo_modemtext.sh

@ -1,7 +1,18 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# shellcheck disable=SC2086 # 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 if [ -z "$*" ]; then
echo "sxmo_terminal.sh called in TERMMODE without any arguments (returning, nothing to do)" >&2 echo "sxmo_terminal.sh called in TERMMODE without any arguments (returning, nothing to do)" >&2

@ -76,7 +76,7 @@ tailtextlog() {
CONTACTNAME="$(sxmo_contacts.sh | grep "^$NUMBER" | cut -d' ' -f2-)" CONTACTNAME="$(sxmo_contacts.sh | grep "^$NUMBER" | cut -d' ' -f2-)"
[ "Unknown Number" = "$CONTACTNAME" ] && CONTACTNAME="$CONTACTNAME ($NUMBER)" [ "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() { readtextmenu() {

Loading…
Cancel
Save