chiark / gitweb /
use tar strip-components to extract src
authorStephen <stephengroat@users.noreply.github.com>
Mon, 6 Nov 2017 17:32:42 +0000 (09:32 -0800)
committerFredrik Fornwall <fredrik@fornwall.net>
Tue, 7 Nov 2017 02:39:13 +0000 (03:39 +0100)
avoids having to manually determine package name, needed for #1743

build-package.sh

index db2adcf4df68b3238c91599f3c088b50776940dd..bf8b82a7177806ec20ae0e898dfead6869cfb1f3 100755 (executable)
@@ -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.