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

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index a44d77cf..47144eba 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,10 +1,9 @@
-TERMUX_PKG_HOMEPAGE=http://termux.com/
-TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.25
+TERMUX_PKG_HOMEPAGE=https://termux.com/
+TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
+TERMUX_PKG_VERSION=0.27
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 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
-
 	# 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 settings; do
@@ -12,16 +11,14 @@ termux_step_make_install () {
 		echo '#!/bin/sh' > $WRAPPER_FILE
 
 		# Some of these tools (am,dalvikvm,?) requires LD_LIBRARY_PATH setup on at least some devices:
-		if [ $tool != getprop ]; then
-			echo 'if [ -n "`getprop ro.product.cpu.abilist64`" ]; then BITS=64; else BITS=; fi' >> $WRAPPER_FILE
-			echo -n 'LD_LIBRARY_PATH=/system/lib$BITS ' >> $WRAPPER_FILE
-		fi
+		echo 'if [ -f /system/bin/linker64 ]; then BITS=64; else BITS=; fi' >> $WRAPPER_FILE
+		echo -n 'LD_LIBRARY_PATH=/system/lib$BITS ' >> $WRAPPER_FILE
 
 		# Some tools require having /system/bin/app_process in the PATH,
 		# at least am&pm on a Nexus 6p running Android 6.0:
 		echo -n 'PATH=$PATH:/system/bin ' >> $WRAPPER_FILE
 
-		echo "exec /system/bin/$tool \$@" >> $WRAPPER_FILE
+		echo "exec /system/bin/$tool \"\$@\"" >> $WRAPPER_FILE
 		chmod +x $TERMUX_PREFIX/bin/$tool
 	done