From d005331ecce984f988d7f48de7480da3297b73ed Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 16 Dec 2008 00:04:23 +0100 Subject: [PATCH] extract_funcs.sh: also accept .gz/.bz2 distfiles. --HG-- extra : convert_revision : 97f42f27316569b9ef463ac1108caec7ce186047 --- utils/sh/extract_funcs.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/utils/sh/extract_funcs.sh b/utils/sh/extract_funcs.sh index c7f92437f4f..d4940b9c92d 100644 --- a/utils/sh/extract_funcs.sh +++ b/utils/sh/extract_funcs.sh @@ -70,12 +70,18 @@ extract_distfiles() fi for f in ${distfiles}; do + curfile=$(basename $f) + if $(echo $f|grep -q '.tar.bz2'); then cursufx=".tar.bz2" elif $(echo $f|grep -q '.tbz'); then cursufx=".tbz" elif $(echo $f|grep -q '.tar.gz'); then cursufx=".tar.gz" + elif $(echo $f|grep -q '.gz'); then + cursufx=".gz" + elif $(echo $f|grep -q '.bz2'); then + cursufx=".bz2" elif $(echo $f|grep -q '.tgz'); then cursufx=".tgz" elif $(echo $f|grep -q '.tar'); then @@ -83,10 +89,9 @@ extract_distfiles() elif $(echo $f|grep -q '.zip'); then cursufx=".zip" else - msg_error "unknown distfile suffix for $f." + msg_error "unknown distfile suffix for $curfile." fi - curfile=$(basename $f) if [ $count -gt 1 ]; then lwrksrc="$wrksrc/${curfile%$cursufx}" @@ -107,6 +112,16 @@ extract_distfiles() msg_error "extracting $curfile into $lwrksrc." fi ;; + .gz|.bz2) + mkdir -p $lwrksrc/$pkgname + cp -f $XBPS_SRCDISTDIR/$curfile $lwrksrc/$pkgname + cd $lwrksrc/$pkgname + if [ "$cursufx" = ".gz" ]; then + gunzip $curfile + else + bunzip2 $curfile + fi + ;; .tar) $ltar_cmd xf $XBPS_SRCDISTDIR/$curfile -C $lwrksrc if [ $? -ne 0 ]; then