From: Stephen <stephengroat@users.noreply.github.com>
Date: Mon, 6 Nov 2017 17:32:42 +0000 (-0800)
Subject: use tar strip-components to extract src
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/e1163ab5bb29bf43b512c2ed71cc4320dac9614e

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 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.