From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 29 Dec 2015 23:55:19 +0000 (-0500)
Subject: termux-tools: df wrapper resetting LD_LIBRARY_PATH
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/159214fa6383fa8b4b2554c2e2da118d7755f44c?hp=9228c43493b3bf7c38a69f6a6e3ab1ae72447e11

termux-tools: df wrapper resetting LD_LIBRARY_PATH
---

diff --git a/packages/termux-tools/am b/packages/termux-tools/am
index 934805fc..a4b796f0 100755
--- 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 de202c70..11fef41a 100644
--- 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
index 00000000..5a1823ac
--- /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 9ec34914..5607e851 100755
--- 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.