X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a0010caca3b1ffed2bbf652750153c0f233fa268..fc45b8e28bdc927f933f41be10a4ebb21a5e9748:/packages/termux-tools/build.sh

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index ed27ea3e..a171bf8d 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,12 +1,23 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.5
+TERMUX_PKG_VERSION=0.24
 
 termux_step_make_install () {
-	$CXX $CFLAGS $LDFLAGS -std=c++14 $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
+	$CXX $CFLAGS $LDFLAGS -std=c++14 -Wall -Wextra -pedantic -Werror $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
 
-	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/
+	# Remove LD_LIBRARY_PATH from environment to avoid conflicting
+	# with system libraries that am may link against.
+	for tool in am dalvikvm df getprop logcat ping ping6 ip pm; do
+		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
 
-	sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/termux-fix-shebang
+	cp -p $TERMUX_PKG_BUILDER_DIR/{su,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
 }