termux-tools: df wrapper resetting LD_LIBRARY_PATH

diff --git a/packages/termux-tools/am b/packages/termux-tools/am
index 934805f..a4b796f 100755 (executable)
--- a/packages/termux-tools/am
+++ b/packages/termux-tools/am
@@ -1,4 +1,4 @@
-#!@TERMUX_PREFIX@/bin/sh
+#!/bin/sh
 
 # Remove LD_LIBRARY_PATH from environment to avoid conflicting
 # with system libraries that am may link against.

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index de202c7..11fef41 100644 (file)
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,11 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.14
+TERMUX_PKG_VERSION=0.15
 
 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
 
-       cp $TERMUX_PKG_BUILDER_DIR/{am,pm,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
-
-       sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/termux-fix-shebang
+       cp -p $TERMUX_PKG_BUILDER_DIR/{am,pm,df,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
 }

diff --git a/packages/termux-tools/df b/packages/termux-tools/df
new file mode 100755 (executable)
index 0000000..5a1823a
--- /dev/null
+++ b/packages/termux-tools/df
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Remove LD_LIBRARY_PATH from environment to avoid conflicting
+# with system libraries that df may link against.
+
+LD_LIBRARY_PATH= exec /system/bin/df $@

diff --git a/packages/termux-tools/pm b/packages/termux-tools/pm
index 9ec3491..5607e85 100755 (executable)
--- a/packages/termux-tools/pm
+++ b/packages/termux-tools/pm
@@ -1,4 +1,4 @@
-#!@TERMUX_PREFIX@/bin/sh
+#!/bin/sh
 
 # Remove LD_LIBRARY_PATH from environment to avoid conflicting
 # with system libraries that pm may link against.