From 18361bd681abb5e614604ad6aa25105d4a09704f Mon Sep 17 00:00:00 2001 From: Stacy Harper Date: Tue, 30 Mar 2021 16:20:48 +0200 Subject: [PATCH] Revert "Use less as sms pager to allow scrollback" This reverts commit 3bb3fb6094a78248e9850a5bf5c5d413e00c4e48. We cannot use this special less argument as it is not busybox less compatible. I add busybox aliases to not reproduce the error in the future. Signed-off-by: Stacy Harper Signed-off-by: Maarten van Gompel --- scripts/core/sxmo_common.sh | 2 ++ scripts/modem/sxmo_modemmonitor.sh | 2 +- scripts/modem/sxmo_modemtext.sh | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/core/sxmo_common.sh b/scripts/core/sxmo_common.sh index becf585..05d7b5f 100644 --- a/scripts/core/sxmo_common.sh +++ b/scripts/core/sxmo_common.sh @@ -32,6 +32,8 @@ alias find="busybox find" alias pkill="busybox pkill" alias pgrep="busybox pgrep" alias xargs="busybox xargs" +alias less="busybox less" +alias tail="busybox tail" SXMO_COMMON_INCLUDED=1 diff --git a/scripts/modem/sxmo_modemmonitor.sh b/scripts/modem/sxmo_modemmonitor.sh index 570c46b..b9668d0 100755 --- a/scripts/modem/sxmo_modemmonitor.sh +++ b/scripts/modem/sxmo_modemmonitor.sh @@ -172,7 +172,7 @@ checkfornewtexts() { sxmo_notificationwrite.sh \ random \ - "st -T '$NUM SMS' -e less +F '$LOGDIR/$NUM/sms.txt'" \ + "st -T '$NUM SMS' -e tail -n9999 -f '$LOGDIR/$NUM/sms.txt'" \ "$LOGDIR/$NUM/sms.txt" \ "Message - $CONTACTNAME: $TEXT" diff --git a/scripts/modem/sxmo_modemtext.sh b/scripts/modem/sxmo_modemtext.sh index c59c47b..36e3c15 100755 --- a/scripts/modem/sxmo_modemtext.sh +++ b/scripts/modem/sxmo_modemtext.sh @@ -108,9 +108,9 @@ senddrafttextmenu() { tailtextlog() { if [ "$TERMMODE" != "true" ]; then - st -T "$1 SMS" -e less +F "$LOGDIR/$1/sms.txt" + st -T "$1 SMS" -e tail -n9999 -f "$LOGDIR/$1/sms.txt" else - less +F "$LOGDIR/$1/sms.txt" + tail -n9999 -f "$LOGDIR/$1/sms.txt" fi }