From 14c15b0973cf0305d92b53b72550a260d7eefaa8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 14 Mar 2014 11:04:51 +0100 Subject: [PATCH] hooks/do-extract/distfiles: simplify and support .tar.lz files. --- common/hooks/do-extract/00-distfiles.sh | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh index b49adece5f..19456cf0d0 100644 --- a/common/hooks/do-extract/00-distfiles.sh +++ b/common/hooks/do-extract/00-distfiles.sh @@ -38,6 +38,8 @@ hook() { case $curfile in *.tar.lzma) cursufx="txz";; + *.tar.lz) cursufx="tlz";; + *.tlz) cursufx="tlz";; *.tar.xz) cursufx="txz";; *.txz) cursufx="txz";; *.tar.bz2) cursufx="tbz";; @@ -58,20 +60,8 @@ hook() { fi case ${cursufx} in - txz) - unxz -cf $srcdir/$curfile | tar xf - -C $extractdir - if [ $? -ne 0 ]; then - msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n" - fi - ;; - tbz) - bunzip2 -cf $srcdir/$curfile | tar xf - -C $extractdir - if [ $? -ne 0 ]; then - msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n" - fi - ;; - tgz) - gunzip -cf $srcdir/$curfile | tar xf - -C $extractdir + txz|tbz|tlz|tgz) + tar xf $srcdir/$curfile -C $extractdir if [ $? -ne 0 ]; then msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n" fi