use tar strip-components to extract src

avoids having to manually determine package name, needed for #1743

diff --git a/build-package.sh b/build-package.sh
index db2adcf4df68b3238c91599f3c088b50776940dd..bf8b82a7177806ec20ae0e898dfead6869cfb1f3 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -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"
                folder=`unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-`
                rm -Rf $folder
                unzip -q "$file"

+               mv $folder "$TERMUX_PKG_SRCDIR"

        else
        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
        fi
        set -o pipefail

-       mv $folder "$TERMUX_PKG_SRCDIR"

 }
 
 # Hook for packages to act just after the package has been extracted.
 }
 
 # Hook for packages to act just after the package has been extracted.