Remove TERMUX_TAR and TERMUX_TOUCH

These can be removed now that OS X is not supported directly (OS X
users can still use Docker to build though).

Fixes #936.

diff --git a/build-package.sh b/build-package.sh
index dad64a0b873c9bdec6683ad648fb6be26a7b7233..f7636d928dd29a976bd50976846699c3458bb335 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -223,8 +223,6 @@ termux_step_setup_variables() {
        # that everyone gets an updated toolchain:
        TERMUX_STANDALONE_TOOLCHAIN+="-v17"
 
-       export TERMUX_TAR="tar"
-       export TERMUX_TOUCH="touch"
        export prefix=${TERMUX_PREFIX}
        export PREFIX=${TERMUX_PREFIX}
        export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
@@ -408,7 +406,7 @@ termux_step_extract_package() {
        if [ "${file##*.}" = zip ]; then
                unzip -q "$file"
        else
-               $TERMUX_TAR xf "$file"
+               tar xf "$file"
        fi
        mv $folder "$TERMUX_PKG_SRCDIR"
 }
@@ -823,12 +821,12 @@ termux_step_extract_into_massagedir() {
 
        # Build diff tar with what has changed during the build:
        cd $TERMUX_PREFIX
-       $TERMUX_TAR -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" .
+       tar -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" .
 
        # Extract tar in order to massage it
        mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
        cd "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
-       $TERMUX_TAR xf "$TARBALL_ORIG"
+       tar xf "$TARBALL_ORIG"
        rm "$TARBALL_ORIG"
 }
 
@@ -938,7 +936,7 @@ termux_step_massage() {
                cd "$SUB_PKG_DIR/massage"
                local SUB_PKG_INSTALLSIZE
                SUB_PKG_INSTALLSIZE=$(du -sk . | cut -f 1)
-               $TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/data.tar.xz" .
+               tar -cJf "$SUB_PKG_PACKAGE_DIR/data.tar.xz" .
 
                mkdir -p DEBIAN
                cd DEBIAN
@@ -953,7 +951,7 @@ termux_step_massage() {
                HERE
                test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control
                test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control
-               $TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
+               tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
 
                for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done
 
@@ -992,7 +990,7 @@ termux_step_create_datatar() {
        if [ -z "${TERMUX_PKG_METAPACKAGE+x}" ] && [ "$(find . -type f)" = "" ]; then
                termux_error_exit "No files in package"
        fi
-       $TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" .
+       tar -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" .
 }
 
 termux_step_create_debscripts() {
@@ -1032,7 +1030,7 @@ termux_step_create_debfile() {
        termux_step_create_debscripts
 
        # Create control.tar.xz
-       $TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" .
+       tar -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" .
 
        test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
        TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb

diff --git a/disabled-packages/openjdk-9-jre-headless/build.sh b/disabled-packages/openjdk-9-jre-headless/build.sh
index 787f6afbf303b10e3aae56f975fd21973d3a6b30..9c89c42a73daa1c5948a5593ad4ac825d6b9aca2 100644 (file)
--- a/disabled-packages/openjdk-9-jre-headless/build.sh
+++ b/disabled-packages/openjdk-9-jre-headless/build.sh
@@ -65,7 +65,7 @@ termux_step_post_extract_package () {
                local url=${_url_src}/$repo/archive/$change.tar.bz2
 
                termux_download $url $file $sum
-               $TERMUX_TAR xf $file -C $TERMUX_PKG_SRCDIR
+               tar xf $file -C $TERMUX_PKG_SRCDIR
                mv $TERMUX_PKG_SRCDIR/$repo-$change $TERMUX_PKG_SRCDIR/$repo
        done
 
@@ -73,7 +73,7 @@ termux_step_post_extract_package () {
        file=$TERMUX_PKG_CACHEDIR/cups-$_cups_ver-source.tar.gz
        url="https://github.com/apple/cups/releases/download/v$_cups_ver/`basename $file`"
        termux_download $url $file ${sha256sums[8]}
-       $TERMUX_TAR xf $file -C $TERMUX_PKG_SRCDIR
+       tar xf $file -C $TERMUX_PKG_SRCDIR
 }
 
 # override this step to since openjdk provides its own customized guess scripts

diff --git a/disabled-packages/swi-prolog/build.sh b/disabled-packages/swi-prolog/build.sh
index b61471916e8e0ea4a10771ee84cdaf563acc0b22..343b51ee31029fd2f5bafa0392c168fc06a5f221 100644 (file)
--- a/disabled-packages/swi-prolog/build.sh
+++ b/disabled-packages/swi-prolog/build.sh
@@ -25,7 +25,7 @@ termux_step_host_build () {
 
 termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/src/defatom src/
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/src/defatom
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/defatom
        #cp $TERMUX_PKG_HOSTBUILD_DIR/{defatom,swipl} $TERMUX_PKG_BUILDDIR/src/
 
        #bdir=/home/fornwall/termux/swi-prolog/src/src

diff --git a/disabled-packages/unnethack/build.sh b/disabled-packages/unnethack/build.sh
index c2b23ba26d35c48d61e7661b0f394e3a5a88d184..92a72dc4fd308f9512ad68d05a7a0aa07eac8e30 100644 (file)
--- a/disabled-packages/unnethack/build.sh
+++ b/disabled-packages/unnethack/build.sh
@@ -47,7 +47,7 @@ termux_step_post_configure () {
        cp $TERMUX_PKG_TMPDIR/host-build/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp
        cp $TERMUX_PKG_TMPDIR/host-build/util/dlb $TERMUX_PKG_BUILDDIR/util/dlb
        # Update timestamp so the binary does not get rebuilt
-        $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/util/makedefs $TERMUX_PKG_BUILDDIR/util/lev_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dlb
+        touch -d "next hour" $TERMUX_PKG_BUILDDIR/util/makedefs $TERMUX_PKG_BUILDDIR/util/lev_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dlb
 }
 
 termux_step_post_make_install () {

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 6d393c6a820447e2216debcb16dff2b3c1bf223c..76588e4607c6fcea5f150adc1f65072d370a48b4 100644 (file)
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -54,7 +54,7 @@ termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs
        cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
        # Update timestamps so that the binaries does not get rebuilt:
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
 }
 
 termux_step_post_make_install () {

diff --git a/packages/gnugo/build.sh b/packages/gnugo/build.sh
index 2cc83060486e1e2137a6f8029b71681c1e598df3..36444253cc799c83b89e4466e0c4f4d09d5be9e2 100644 (file)
--- a/packages/gnugo/build.sh
+++ b/packages/gnugo/build.sh
@@ -18,5 +18,5 @@ termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/patterns/joseki $TERMUX_PKG_BUILDDIR/patterns/joseki
        cp $TERMUX_PKG_HOSTBUILD_DIR/patterns/mkmcpat $TERMUX_PKG_BUILDDIR/patterns/mkmcpat
        cp $TERMUX_PKG_HOSTBUILD_DIR/patterns/mkpat $TERMUX_PKG_BUILDDIR/patterns/mkpat
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/patterns/*
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/patterns/*
 }

diff --git a/packages/gnushogi/build.sh b/packages/gnushogi/build.sh
index e4d9d3de236933b85d4ac5516341e5bb5115bbfc..f74e8425e1daf6961693ff82ca34cff6b84566db 100644 (file)
--- a/packages/gnushogi/build.sh
+++ b/packages/gnushogi/build.sh
@@ -15,5 +15,5 @@ termux_step_pre_configure() {
 termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/gnushogi/pat2inc $TERMUX_PKG_BUILDDIR/gnushogi/pat2inc
        # Update timestamps so that the binaries does not get rebuilt:
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/gnushogi/pat2inc
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/gnushogi/pat2inc
 }

diff --git a/packages/ht/build.sh b/packages/ht/build.sh
index 6826f047b7d7172b8d68614c8fb4971b9328c941..21b87b6d6fe6b0a159f255fdbfcb33c5a9994056 100755 (executable)
--- a/packages/ht/build.sh
+++ b/packages/ht/build.sh
@@ -9,5 +9,5 @@ termux_step_post_configure () {
        mkdir -p $TERMUX_PKG_BUILDDIR/tools/
        g++ -Os $TERMUX_PKG_SRCDIR/tools/bin2c.c -o $TERMUX_PKG_BUILDDIR/tools/bin2c
        # Update timestamps so that the binary does not get rebuilt:
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/tools/bin2c
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/tools/bin2c
 }

diff --git a/packages/libsasl/build.sh b/packages/libsasl/build.sh
index e53c06d3ed99f35f2f8dc215834cc42cf914a6f0..e48e6963f0e8af5ff3209027908a5f1f21ea6ddc 100644 (file)
--- a/packages/libsasl/build.sh
+++ b/packages/libsasl/build.sh
@@ -16,5 +16,5 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/pluginviewer"
 termux_step_post_configure () {
        # Build wants to run makemd5 at build time:
        gcc $TERMUX_PKG_SRCDIR/include/makemd5.c -o $TERMUX_PKG_BUILDDIR/include/makemd5
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/include/makemd5
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/include/makemd5
 }

diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index ee0bba39ca480716e74fea4915f99bea214230e3..cdb6ac5a64e310c550cee6748da535c319879750 100644 (file)
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -18,7 +18,7 @@ termux_step_post_configure () {
        # Build wants to run mutt_md5 and makedoc:
        gcc -DHAVE_STDINT_H -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5
        gcc -DHAVE_STRERROR $TERMUX_PKG_SRCDIR/doc/makedoc.c -o $TERMUX_PKG_BUILDDIR/doc/makedoc
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $TERMUX_PKG_BUILDDIR/doc/makedoc
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $TERMUX_PKG_BUILDDIR/doc/makedoc
 }
 
 termux_step_post_make_install () {

diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh
index cc2b234b1a2e71d34619d02c0921370f30549109..a001e38588f2696d33364a482145e5e800765aab 100644 (file)
--- a/packages/ncdc/build.sh
+++ b/packages/ncdc/build.sh
@@ -10,5 +10,5 @@ termux_step_post_configure () {
        # Cross compiling steps documented in ncdc README
        gcc $TERMUX_PKG_SRCDIR/deps/makeheaders.c -o makeheaders
        gcc -I. $TERMUX_PKG_SRCDIR/doc/gendoc.c -o gendoc
-       $TERMUX_TOUCH -d "next hour" makeheaders gendoc
+       touch -d "next hour" makeheaders gendoc
 }

diff --git a/packages/pforth/build.sh b/packages/pforth/build.sh
index 79198d899ce9635e0624f84eb39a60639bf84893..c03c76f408119a146e4b884b586a2a1d1f34029c 100644 (file)
--- a/packages/pforth/build.sh
+++ b/packages/pforth/build.sh
@@ -17,7 +17,7 @@ termux_step_host_build () {
 termux_step_pre_configure () {
        for file in pfdicdat.h pforth; do
                cp $TERMUX_PKG_HOSTBUILD_DIR/build/unix/$file $TERMUX_PKG_SRCDIR/build/unix/$file
-               $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_SRCDIR/build/unix/$file
+               touch -d "next hour" $TERMUX_PKG_SRCDIR/build/unix/$file
        done
 
        export TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/build/unix

diff --git a/packages/python/build.sh b/packages/python/build.sh
index 7c397a2a0571ecf2936dfd9ef2cfc3edd5171958..09f9728d1f27a8b46bf21458f87a2416ad34226c 100644 (file)
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -59,8 +59,8 @@ termux_step_pre_configure() {
 termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/Parser/pgen $TERMUX_PKG_BUILDDIR/Parser/pgen
        cp $TERMUX_PKG_HOSTBUILD_DIR/Programs/_freeze_importlib $TERMUX_PKG_BUILDDIR/Programs/_freeze_importlib
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Programs/_freeze_importlib
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/Programs/_freeze_importlib
 }
 
 termux_step_post_make_install () {

diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index 3e9df76d2469438d8a168addf88d0a6a2e3f2e3a..12098cb555fdbe6ae17443f5350bb878a1d8a5c1 100644 (file)
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -42,7 +42,7 @@ termux_step_host_build () {
 
 termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/Parser/pgen $TERMUX_PKG_BUILDDIR/Parser/pgen
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
 }
 
 termux_step_pre_configure() {

diff --git a/packages/sed/build.sh b/packages/sed/build.sh
index a93df124559c3e1e6c12bd5588a60695cd8840d3..b7009bf4e1216bd42f6a15ab408ecb25d5ed90b3 100644 (file)
--- a/packages/sed/build.sh
+++ b/packages/sed/build.sh
@@ -6,5 +6,5 @@ TERMUX_PKG_SHA256=cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd94268
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_post_configure () {
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_SRCDIR/doc/sed.1
+       touch -d "next hour" $TERMUX_PKG_SRCDIR/doc/sed.1
 }

diff --git a/packages/zile/build.sh b/packages/zile/build.sh
index 858719c6bc0d91a70e423b8df799dd922414ce90..3af736e36d6722fb257442ac9238ed869d6a2649 100755 (executable)
--- a/packages/zile/build.sh
+++ b/packages/zile/build.sh
@@ -11,5 +11,5 @@ termux_step_post_configure() {
        # zile uses help2man to build the zile.1 man page, which would require
        # a host build. To avoid that just copy a pre-built man page.
        cp $TERMUX_PKG_BUILDER_DIR/zile.1 $TERMUX_PKG_BUILDDIR/doc/zile.1
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/doc/zile.1*
+       touch -d "next hour" $TERMUX_PKG_BUILDDIR/doc/zile.1*
 }