From 5d29da3dc600e28cdba242bfb5f0dea392fa3aca Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 4 Apr 2019 12:49:32 +0300
Subject: [PATCH] termux-tools: do not start login shell if not running on
 terminal

Fixes execution of commands via non-interactive shell with OpenSSH.
Issue https://github.com/termux/termux-packages/issues/3620.
---
 packages/termux-tools/build.sh | 2 +-
 packages/termux-tools/login    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 5365fdcc1a..e3756207f2 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://termux.com/
 TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=0.61
+TERMUX_PKG_VERSION=0.62
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_DEPENDS="termux-am"
diff --git a/packages/termux-tools/login b/packages/termux-tools/login
index 9652d67afa..8538721065 100755
--- a/packages/termux-tools/login
+++ b/packages/termux-tools/login
@@ -20,4 +20,8 @@ if [ -f $PREFIX/lib/libtermux-exec.so ]; then
 	$SHELL -c "busybox true" > /dev/null 2>&1 || unset LD_PRELOAD
 fi
 
-exec "$SHELL" -l "$@"
+if [ -n "$TERM" ]; then
+	exec "$SHELL" -l "$@"
+else
+	exec "$SHELL" "$@"
+fi