Pass -q to unzip

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index eb44cd8..e126a50 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -17,7 +17,7 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc
 : ${TERMUX_DEBUG:=""}
 : ${TERMUX_PROCESS_DEB:=""}
 : ${TERMUX_API_LEVEL:="21"}
-: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.3"}
+: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"}
 : ${TERMUX_NDK_VERSION:="12"}
 
 # Handle command-line arguments:
@@ -90,13 +90,12 @@ if [ $TERMUX_ARCH = 'all' ]; then
        exit
 fi
 
-echo "termux - building $1 for arch $TERMUX_ARCH..."
-test -t 1 && printf "\033]0;$1...\007"
-
 # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
 # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
 # the standalone toolchain.
 TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx
+TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar
+TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar
 
 # We put this after system PATH to avoid picking up toolchain stripped python
 export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
@@ -282,7 +281,7 @@ termux_download() {
                         return
                 else
                         echo "Download of $1 failed (attempt $i/3)" 1>&2
-                        sleep 6
+                        sleep 20
                 fi
         done
         echo "Failed to download $1 - exiting" 1>&2
@@ -362,7 +361,7 @@ termux_step_extract_package () {
        fi
        rm -Rf $folder
        if [ ${file##*.} = zip ]; then
-               unzip $file
+               unzip -q $file
        else
                $TERMUX_TAR xf $file
        fi
@@ -681,6 +680,14 @@ termux_setup_golang () {
 
 source $TERMUX_PKG_BUILDER_SCRIPT
 
+if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" -a "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
+       echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
+       exit 0
+fi
+
+echo "termux - building $1 for arch $TERMUX_ARCH..."
+test -t 1 && printf "\033]0;$1...\007"
+
 # Compute full version:
 TERMUX_PKG_FULLVERSION=$TERMUX_PKG_VERSION
 if [ "$TERMUX_PKG_BUILD_REVISION" != "0" -o "$TERMUX_PKG_FULLVERSION" != "${TERMUX_PKG_FULLVERSION/-/}" ]; then