PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

00-distfiles.sh: fix bsdtar contents checksum (@)

Browse Source 
Closes: #18070
This commit is contained in:
Jürgen Buchmüller 2020-01-06 15:12:52 +01:00
parent 596523c20c
commit 834a0a397f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/hooks/do-fetch/00-distfiles.sh
View File

@ -50,7 +50,7 @@ contents_cksum() {
case ${cursufx} in case ${cursufx} in
tar|txz|tbz|tlz|tgz|crate) tar|txz|tbz|tlz|tgz|crate)
cksum=$($XBPS_DIGEST_CMD <($TAR_CMD xf "$curfile" $TAR_CMD_STDOUT)) cksum=$($XBPS_DIGEST_CMD <($TAR_CMD -x -O -f "$curfile"))
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile to pipe.\n" msg_error "$pkgver: extracting $curfile to pipe.\n"
fi fi
@ -73,7 +73,7 @@ contents_cksum() {
;; ;;
rpm) rpm)
if command -v rpmextract &>/dev/null; then if command -v rpmextract &>/dev/null; then
cksum=$($XBPS_DIGEST_CMD <(rpm2cpio "$curfile" | $TAR_CMD xf - $TAR_CMD_STDOUT)) cksum=$($XBPS_DIGEST_CMD <(rpm2cpio "$curfile" | $TAR_CMD -x -f -))
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile to pipe.\n" msg_error "$pkgver: extracting $curfile to pipe.\n"
fi fi
@ -95,7 +95,7 @@ contents_cksum() {
fi fi
;; ;;
gem) gem)
cksum=$($XBPS_DIGEST_CMD <($TAR_CMD -xf "$curfile" data.tar.gz $TAR_CMD_STDOUT | $TAR_CMD -xzO )) cksum=$($XBPS_DIGEST_CMD <($TAR_CMD -x -O -f "$curfile" data.tar.gz | $TAR_CMD -xzO ))
;; ;;
*) *)
msg_error "$pkgver: cannot guess $curfile extract suffix. ($cursufx)\n" msg_error "$pkgver: cannot guess $curfile extract suffix. ($cursufx)\n"
@ -212,11 +212,8 @@ hook() {
# Detect bsdtar and GNU tar (in that order of preference) # Detect bsdtar and GNU tar (in that order of preference)
TAR_CMD="$(command -v bsdtar)" TAR_CMD="$(command -v bsdtar)"
if [ "$TAR_CMD" ]; then if [ -z "$TAR_CMD" ]; then
TAR_CMD_STDOUT="--list"
else
TAR_CMD="$(command -v tar)" TAR_CMD="$(command -v tar)"
TAR_CMD_STDOUT="--to-stdout"
fi fi
# Detect distfiles with obsolete checksum and purge them from the cache # Detect distfiles with obsolete checksum and purge them from the cache
@ -282,7 +279,7 @@ hook() {
dfcount=$((dfcount + 1)) dfcount=$((dfcount + 1))
done done
unset TAR_CMD TAR_CMD_STDOUT unset TAR_CMD
if [ $errors -gt 0 ]; then if [ $errors -gt 0 ]; then
msg_error "$pkgver: couldn't verify distfiles, exiting...\n" msg_error "$pkgver: couldn't verify distfiles, exiting...\n"