From 175eefe18d80af24c52f4ee812054836a779bc75 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 16 Dec 2008 02:17:32 +0100 Subject: [PATCH] extract_funs.sh: fix for multiple distfiles. --HG-- extra : convert_revision : 25557c3b6fda8f26ec9ac152e07a60c3afe5a23e --- utils/sh/extract_funcs.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/utils/sh/extract_funcs.sh b/utils/sh/extract_funcs.sh index d4940b9c92..9b50375cfb 100644 --- a/utils/sh/extract_funcs.sh +++ b/utils/sh/extract_funcs.sh @@ -94,7 +94,7 @@ extract_distfiles() if [ $count -gt 1 ]; then - lwrksrc="$wrksrc/${curfile%$cursufx}" + lwrksrc="$wrksrc" else lwrksrc="$XBPS_BUILDDIR" fi @@ -113,13 +113,11 @@ extract_distfiles() fi ;; .gz|.bz2) - mkdir -p $lwrksrc/$pkgname - cp -f $XBPS_SRCDISTDIR/$curfile $lwrksrc/$pkgname - cd $lwrksrc/$pkgname + cp -f $XBPS_SRCDISTDIR/$curfile $lwrksrc if [ "$cursufx" = ".gz" ]; then - gunzip $curfile + cd $lwrksrc && gunzip $curfile else - bunzip2 $curfile + cd $lwrksrc && bunzip2 $curfile fi ;; .tar)