From a67189c23684889863322f2692610aa9c0efafed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 18 Sep 2021 21:02:51 +0700
Subject: [PATCH] hooks: do-extract: simplify gem extraction

---
 common/hooks/do-extract/00-distfiles.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index 922f7029491..ca2011d5c45 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -3,7 +3,7 @@
 
 hook() {
 	local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
-	local f j curfile found extractdir
+	local f j curfile found extractdir innerdir
 	local TAR_CMD
 
 	if [ -z "$distfiles" -a -z "$checksum" ]; then
@@ -150,16 +150,10 @@ hook() {
 			fi
 			;;
 		gem)
-			case "$TAR_CMD" in
-				*bsdtar)
-					$TAR_CMD -xOf $srcdir/$curfile data.tar.gz | \
-						$TAR_CMD -xz -C "$extractdir" -s ",^,${wrksrc##*/}/," -f -
-					;;
-				*)
-					$TAR_CMD -xOf $srcdir/$curfile data.tar.gz | \
-						$TAR_CMD -xz -C "$extractdir" --transform="s,^,${wrksrc##*/}/,"
-					;;
-			esac
+			innerdir="$extractdir/${wrksrc##*/}"
+			mkdir -p "$innerdir"
+			$TAR_CMD -xOf $srcdir/$curfile data.tar.gz |
+				$TAR_CMD -xz -C "$innerdir" -f -
 			if [ $? -ne 0 ]; then
 				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
 			fi