Simplify the termmode detection

As we now rely on sxmo_terminal.sh and the TERMCMD env variable, we then
can simplify things.

In the sxmo dwm context, TERMCMD="st -e" so sxmo_terminal.sh will run
the command in st.

In the ssh context, we dont have TERMCMD so sxmo_terminal.sh will just
run the command

In a tmux context, we can set TERMCMD="tmux split-window" with
set-environment -g TERMCMD "tmux split-window"
so sxmo_terminal.sh will run the command in a splited window.

Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>

configs/appcfg/xinit_template

@@ -52,7 +52,8 @@ command -v firefox && export BROWSER=firefox
 #(useful for getting notifications)
 #export SXMO_RTCWAKEINTERVAL=300
 
-export TERMCMD="st -e"
+# Change the default terminal command
+# export TERMCMD="st -e"
 
 # Immediately turn the screen off when locking the device
 export SXMO_LOCK_SCREEN_OFF=1

scripts/core/sxmo_xinit.sh

@@ -6,7 +6,7 @@ envvars() {
 	[ -f /etc/profile ] && . /etc/profile
 	# shellcheck source=/dev/null
 	[ -f "$HOME"/.profile ] && . "$HOME"/.profile
-	command -v "$TERMCMD" || export TERMCMD=st
+	command -v "$TERMCMD" || export TERMCMD="st -e"
 	command -v "$BROWSER" || export BROWSER=surf
 	command -v "$EDITOR" || export EDITOR=vis
 	command -v "$SHELL" || export SHELL=/bin/sh

scripts/modem/sxmo_modemtext.sh

@@ -4,8 +4,6 @@
 # shellcheck source=scripts/core/sxmo_common.sh
 . "$(dirname "$0")/sxmo_common.sh"
 
-TERMMODE=$([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && echo "true")
-
 err() {
 	echo "$1">&2
 	echo "$1" | dmenu -c -l 10
@@ -53,11 +51,7 @@ sendtextmenu() {
 		echo 'Enter text message here' > "$DRAFT"
 	fi
 
-	if [ "$TERMMODE" != "true" ]; then
+	sxmo_terminal.sh "$EDITOR" "$DRAFT"
-		sxmo_terminal.sh "$EDITOR" "$DRAFT"
-	else
-		"$EDITOR" "$DRAFT"
-	fi
 
 	while true
 	do