Move $PREFIX/bin/env from coreutils to busybox

[termux-packages] / packages / busybox / build.sh

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 7e9909c..6c2fab0 100755 (executable)
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -1,9 +1,12 @@
 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.23.2
+TERMUX_PKG_VERSION=1.24.2
+TERMUX_PKG_BUILD_REVISION=2
 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
 
@@ -30,14 +33,18 @@ 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
-       # Wasteful with a copy, but need to update pwd.h patch before fixing:
-       cp busybox ash
-       chmod +x ash
+       ln -f -s busybox ash
+       ln -f -s busybox env
 
        # Install busybox man page
        mkdir -p $TERMUX_PREFIX/share/man/man1
        cp $TERMUX_PKG_SRCDIR/docs/busybox.1 $TERMUX_PREFIX/share/man/man1
+
+       # Needed for 'crontab -e' to work out of the box:
+       local _CRONTABS=$TERMUX_PREFIX/var/spool/cron/crontabs
+       mkdir -p $_CRONTABS
+       echo "Used by the busybox crontab and crond tools" > $_CRONTABS/README.termux
 }