~mil/sxmo-utils

60dd08fa2724c176485d182e487d115f70987a38 — Stacy Harper 5 months ago e428d0c
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>
2 files changed, 14 insertions(+), 3 deletions(-)

M scripts/core/sxmo_terminal.sh
M scripts/modem/sxmo_modemtext.sh
M scripts/core/sxmo_terminal.sh => scripts/core/sxmo_terminal.sh +13 -2
@@ 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

M scripts/modem/sxmo_modemtext.sh => scripts/modem/sxmo_modemtext.sh +1 -1
@@ 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() {