aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2022-11-09 12:36:30 +0000
committerĐoàn Trần Công Danh <sgn.danh@gmail.com>2022-11-30 16:20:04 +0000
commit1b2519f7657df7398a0e3824ee790c883ad042aa (patch)
treedaa862e953b9b9169cfbd73b54acad0d6650d1c7
parent7436cebdd5e027d7b7e144e0dc403934c1d616db (diff)
downloadvoid-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.tar
void-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.tar.gz
void-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.tar.bz2
void-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.tar.lz
void-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.tar.xz
void-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.tar.zst
void-packages-1b2519f7657df7398a0e3824ee790c883ad042aa.zip
do-extract: extract rpm with bsdtar, too
-rw-r--r--common/hooks/do-extract/00-distfiles.sh14
1 files changed, 6 insertions, 8 deletions
diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index b3f3b90b7b8..14503de3ed7 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -111,14 +111,12 @@ hook() {
fi
;;
rpm)
- if command -v rpmextract &>/dev/null; then
- cd "$extractdir"
- rpmextract $srcdir/$curfile
- if [ $? -ne 0 ]; then
- msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
- fi
- else
- msg_error "$pkgver: cannot find rpmextract for extraction.\n"
+ if ! command -v bsdtar &>/dev/null; then
+ msg_error "$pkgver: cannot find bsdtar for extraction.\n"
+ fi
+ bsdtar -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C "$extractdir"
+ if [ $? -ne 0 ]; then
+ msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
;;
deb)