From 145d0fe3d61a21f2ba20a34ea96f54eb11f9324f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 21 Mar 2016 22:42:11 -0400
Subject: [PATCH] termux-tools: Fix the am and pm wrapper

---
 packages/termux-tools/build.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index c1efcb2ba..fbb89f239 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.18
+TERMUX_PKG_VERSION=0.19
 
 termux_step_make_install () {
 	$CXX $CFLAGS $LDFLAGS -std=c++14 -Wall -Wextra -pedantic -Werror $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
@@ -8,8 +8,14 @@ termux_step_make_install () {
 	# Remove LD_LIBRARY_PATH from environment to avoid conflicting
 	# with system libraries that am may link against.
 	for tool in am dalvikvm df logcat ping pm; do
-		echo '#!/bin/sh' > $TERMUX_PREFIX/bin/$tool
-		echo "LD_LIBRARY_PATH= exec /system/bin/$tool \$@" >> $TERMUX_PREFIX/bin/$tool
+		WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
+		echo '#!/bin/sh' > $WRAPPER_FILE
+		if [ $tool = am -o $tool = pm ]; then
+			# These tools require having /system/bin/app_process in the PATH,
+			# at least on a Nexus 6p running Android 6.0.
+			echo -n 'PATH=$PATH:/system/bin ' >> $WRAPPER_FILE
+		fi
+		echo "LD_LIBRARY_PATH= exec /system/bin/$tool \$@" >> $WRAPPER_FILE
 		chmod +x $TERMUX_PREFIX/bin/$tool
 	done