From 0ee447355b7af22a3d279884568231c55e24b327 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 31 Aug 2016 17:39:18 -0400
Subject: [PATCH] termux-tools: Try a more functional su wrapper

---
 packages/termux-tools/build.sh |  2 +-
 packages/termux-tools/su       | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 04048e93..4672ce9b 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.28
+TERMUX_PKG_VERSION=0.29
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_make_install () {
diff --git a/packages/termux-tools/su b/packages/termux-tools/su
index e4a9bd82..cc3d9af1 100755
--- a/packages/termux-tools/su
+++ b/packages/termux-tools/su
@@ -1,11 +1,16 @@
-#!/bin/sh
+#!/data/data/com.termux/files/usr/bin/sh
+
+ROOT_SHELL=$PREFIX/bin/bash
+if test -x "$HOME/.termux/shell"; then ROOT_SHELL=`readlink -f $HOME/.termux/shell`; fi
 
 for p in /system/xbin/su /su/bin/su
 do
 	if [ -x $p ]; then
-		# The su tool may require programs
-		# from /system/bin in path:
-		PATH=/system/bin:$PATH exec $p $@
+		# The su tool may require programs in PATH:
+		PATH=$PATH:/su/bin:/su/xbin:/system/bin:/system/xbin \
+			exec $p \
+			--preserve-environment \
+			-c "LD_LIBRARY_PATH=$PREFIX/lib $ROOT_SHELL"
 	fi
 done
 
-- 
2.11.0