snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

00-distfiles.sh: allow bsdtar for zip and 7z archives

This commit is contained in:
mobinmob 2020-01-19 21:06:55 +02:00 committed by Jürgen Buchmüller
parent 0dbdcb4e1d
commit d224b06d8e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/hooks/do-extract/00-distfiles.sh
View File

@ -98,8 +98,13 @@ hook() {
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n" msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi fi
elif command -v bsdtar &>/dev/null; then
bsdtar -xf $srcdir/$curfile -C $extractdir
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
else else
msg_error "$pkgver: cannot find unzip bin for extraction.\n" msg_error "$pkgver: cannot find unzip or bsdtar bin for extraction.\n"
fi fi
;; ;;
rpm) rpm)
@ -122,8 +127,13 @@ hook() {
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n" msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi fi
elif command -v bsdtar &>/dev/null; then
bsdtar -xf $srcdir/$curfile -C $extractdir
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
else else
msg_error "$pkgver: cannot find 7z bin for extraction.\n" msg_error "$pkgver: cannot find 7z or bsdtar bin for extraction.\n"
fi fi
;; ;;
gem) gem)