X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/27ce01e83bf0264b9aed9595226ef84f07ca0f52..4932e61a5f7765703dab5baa9d6e334c79ac0c7a:/packages/busybox/build.sh

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 2a8ac8dc..7c78863b 100755
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -1,12 +1,15 @@
 TERMUX_PKG_HOMEPAGE=http://www.busybox.net/
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_ESSENTIAL=yes
-TERMUX_PKG_VERSION=1.24.1
-TERMUX_PKG_BUILD_REVISION=3
+TERMUX_PKG_VERSION=1.24.2
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
+# We replace env in the old coreutils package:
+TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)"
 
-# NOTE: sed on mac does not work for building busybox, install gsed and symlink sed => gsed
+# NOTE: sed on mac does not work for building busybox, install gnu-sed with
+#       homebrew using the --with-default-names option.
 
 CFLAGS+=" -llog -DTERMUX_EXPOSE_MEMPCPY=1" # Android system liblog.so for syslog
 
@@ -31,9 +34,10 @@ termux_step_post_make_install () {
 	cd $TERMUX_PREFIX/bin/applets
 	for f in `cat $TERMUX_PKG_SRCDIR/busybox.links`; do ln -s ../busybox `basename $f`; done
 
+        # The 'ash' and 'env' applets are special in that they go into $PREFIX/bin:
 	cd $TERMUX_PREFIX/bin
-	rm -f ash
-	ln -s busybox ash
+	ln -f -s busybox ash
+	ln -f -s busybox env
 
 	# Install busybox man page
 	mkdir -p $TERMUX_PREFIX/share/man/man1