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

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index dadab7eb..5de207c0 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,27 +1,30 @@
 TERMUX_PKG_HOMEPAGE=https://termux.com/
 TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
-TERMUX_PKG_VERSION=0.30
+TERMUX_PKG_VERSION=0.54
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
+TERMUX_PKG_ESSENTIAL=yes
+TERMUX_PKG_DEPENDS="termux-am"
+TERMUX_PKG_CONFFILES="etc/motd"
 
 termux_step_make_install () {
+	mkdir -p $TERMUX_PREFIX/bin/applets
 	# Remove LD_LIBRARY_PATH from environment to avoid conflicting
-	# with system libraries that am may link against.
-	for tool in am df getprop logcat ping ping6 ip pm settings; do
+	# with system libraries that system binaries may link against:
+	for tool in df getprop logcat ping ping6 ip pm settings; do
 		WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
 		echo '#!/bin/sh' > $WRAPPER_FILE
-
-		# Some of these tools (am,dalvikvm,?) requires LD_LIBRARY_PATH setup on at least some devices:
-		echo 'if [ -f /system/bin/linker64 ]; then BITS=64; else BITS=; fi' >> $WRAPPER_FILE
-		echo -n 'LD_LIBRARY_PATH=/system/lib$BITS ' >> $WRAPPER_FILE
-
+		echo 'unset LD_LIBRARY_PATH LD_PRELOAD' >> $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
-		chmod +x $TERMUX_PREFIX/bin/$tool
+		chmod +x $WRAPPER_FILE
 	done
 
-	cp -p $TERMUX_PKG_BUILDER_DIR/{dalvikvm,su,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
+	cp -p $TERMUX_PKG_BUILDER_DIR/{dalvikvm,su,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url,termux-wake-lock,termux-wake-unlock,login,pkg,termux-open,termux-info} $TERMUX_PREFIX/bin/
 	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dalvikvm
+
+	cp $TERMUX_PKG_BUILDER_DIR/motd $TERMUX_PREFIX/etc/motd
+	cd $TERMUX_PREFIX/bin
+	ln -s -f termux-open xdg-open
 }