X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/ca7699c16955e3dd8cff7a5e75b20e7b0360d036..c88dfb145cbaf6c7b231f8f82d8519763d12418d:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index e989f0ea..b2e1cab2 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -185,7 +185,7 @@ termux_step_setup_variables() {
 	: "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
 	: "${TERMUX_DEBUG:=""}"
 	: "${TERMUX_API_LEVEL:="21"}"
-	: "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.1"}"
+	: "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}"
 	: "${TERMUX_NDK_VERSION:="14"}"
 
 	if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
@@ -397,7 +397,7 @@ termux_step_extract_package() {
 	termux_download "$TERMUX_PKG_SRCURL" "$file" "$TERMUX_PKG_SHA256"
 
 	if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
-		folder=`basename $filename .tar.bz2` && folder=`basename $folder .tar.gz` && folder=`basename $folder .tar.xz` && folder=`basename $folder .tar.lz` && folder=`basename $folder .tgz` && folder=`basename $folder .zip`
+		folder="${filename%%.t*}" && folder="${folder%%.zip}"
 		folder="${folder/_/-}" # dpkg uses _ in tar filename, but - in folder
 	else
 		folder=$TERMUX_PKG_FOLDERNAME