From a0010caca3b1ffed2bbf652750153c0f233fa268 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 18 Jul 2015 05:42:44 -0400
Subject: [PATCH] Move termux-user from termux-api to termux-tools

Also add a am wrapper script which clears
LD_LIBRARY_PATH before calling /system/bin/am.
---
 packages/termux-api/build.sh                      | 2 +-
 packages/termux-tools/am                          | 6 ++++++
 packages/termux-tools/build.sh                    | 6 +++---
 packages/{termux-api => termux-tools}/termux-user | 0
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100755 packages/termux-tools/am
 rename packages/{termux-api => termux-tools}/termux-user (100%)

diff --git a/packages/termux-api/build.sh b/packages/termux-api/build.sh
index 6b900cb5..b7810efe 100644
--- a/packages/termux-api/build.sh
+++ b/packages/termux-api/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/add-ons/api/
 TERMUX_PKG_DESCRIPTION="Termux API commands"
-TERMUX_PKG_VERSION=0.4.50
+TERMUX_PKG_VERSION=0.4.51
 
 termux_step_make_install () {
         mkdir -p $TERMUX_PREFIX/bin
diff --git a/packages/termux-tools/am b/packages/termux-tools/am
new file mode 100755
index 00000000..7857a150
--- /dev/null
+++ b/packages/termux-tools/am
@@ -0,0 +1,6 @@
+#!@TERMUX_PREFIX@/bin/sh
+
+# Remove LD_LIBRARY_PATH from environment to avoid conflicting
+# with system libraries that am may link against.
+
+LD_LIBRARY_PATH= /system/bin/am $@
diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 1f1d376b..ed27ea3e 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,12 +1,12 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.3
+TERMUX_PKG_VERSION=0.5
 
 termux_step_make_install () {
 	$CXX $CFLAGS $LDFLAGS -std=c++14 $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
 
-	rm -f $TERMUX_PREFIX/bin/{termux-fix-shebang,termux-reload-style,chsh,termux-open-url}
-	cp $TERMUX_PKG_BUILDER_DIR/{termux-fix-shebang,termux-reload-style,chsh,termux-open-url} $TERMUX_PREFIX/bin/
+	rm -f $TERMUX_PREFIX/bin/{am,termux-user,termux-fix-shebang,termux-reload-style,chsh,termux-open-url}
+	cp $TERMUX_PKG_BUILDER_DIR/{am,termux-user,termux-fix-shebang,termux-reload-style,chsh,termux-open-url} $TERMUX_PREFIX/bin/
 
 	sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/termux-fix-shebang
 }
diff --git a/packages/termux-api/termux-user b/packages/termux-tools/termux-user
similarity index 100%
rename from packages/termux-api/termux-user
rename to packages/termux-tools/termux-user
-- 
2.11.0