debootstrap: Update from 1.0.91 to 1.0.92

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index db2adcf..5cd4fdc 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -160,7 +160,7 @@ termux_setup_meson() {
 # Utility function to setup a current cmake build system
 termux_setup_cmake() {
        local TERMUX_CMAKE_MAJORVESION=3.9
-       local TERMUX_CMAKE_MINORVERSION=5
+       local TERMUX_CMAKE_MINORVERSION=6
        local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
        local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
        local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -168,7 +168,7 @@ termux_setup_cmake() {
        if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
                termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
                                "$TERMUX_CMAKE_TARFILE" \
-                               bbe7e2ea703835661bb92fedd485d62dc587ee36daaedaa0a7bebcbf937a1cea
+                               062bf45bee36ce7c2a55ae26b8b5324720f370d420a05cba91b9448c64ffdbea
                rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
                tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
                mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
@@ -472,13 +472,12 @@ termux_step_extract_package() {
                folder=`unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-`
                rm -Rf $folder
                unzip -q "$file"
+               mv $folder "$TERMUX_PKG_SRCDIR"
        else
-               folder=`tar tf "$file" | head -1 | sed 's/^.\///' | sed -e 's/\/.*//'`
-               rm -Rf $folder
-               tar xf "$file"
+               mkdir "$TERMUX_PKG_SRCDIR"
+               tar xf "$file" -C "$TERMUX_PKG_SRCDIR" --strip-components=1
        fi
        set -o pipefail
-       mv $folder "$TERMUX_PKG_SRCDIR"
 }
 
 # Hook for packages to act just after the package has been extracted.