From 2cac774bfb02c4bb2b34c8871d5d3b29b12d7e1c Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 17 Sep 2017 22:43:03 +0200 Subject: [PATCH] termux-tools: Make bin/login handle arguments As we now use bin/login even from e.g. sshd we need to handle arguments by forwarding it to the login shell and not displaying a motd in that case. Fixes #1529. --- packages/termux-tools/build.sh | 2 +- packages/termux-tools/login | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh index 8a06715d..332051bb 100644 --- a/packages/termux-tools/build.sh +++ b/packages/termux-tools/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=https://termux.com/ TERMUX_PKG_DESCRIPTION="Basic system tools for Termux" -TERMUX_PKG_VERSION=0.45 +TERMUX_PKG_VERSION=0.46 TERMUX_PKG_PLATFORM_INDEPENDENT=yes TERMUX_PKG_CONFFILES="etc/motd" diff --git a/packages/termux-tools/login b/packages/termux-tools/login index f01e293c..9da9aac7 100755 --- a/packages/termux-tools/login +++ b/packages/termux-tools/login @@ -1,6 +1,6 @@ #!/data/data/com.termux/files/usr/bin/sh -if [ -f $PREFIX/etc/motd ] && [ ! -f ~/.hushlogin ]; then +if [ $# = 0 ] && [ -f $PREFIX/etc/motd ] && [ ! -f ~/.hushlogin ]; then cat $PREFIX/etc/motd fi @@ -19,5 +19,4 @@ if [ -f $PREFIX/lib/libtermux-exec.so ]; then export LD_PRELOAD=$PREFIX/lib/libtermux-exec.so fi -exec "$SHELL" -l - +exec "$SHELL" -l "$@" -- 2.11.0