From e1163ab5bb29bf43b512c2ed71cc4320dac9614e Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 6 Nov 2017 09:32:42 -0800 Subject: [PATCH] use tar strip-components to extract src avoids having to manually determine package name, needed for #1743 --- build-package.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-package.sh b/build-package.sh index db2adcf4..bf8b82a7 100755 --- 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" + 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. -- 2.11.0