From b2afcc35bed3824da6a5787dda4c91392e77f467 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 12 Mar 2014 13:47:57 +0100 Subject: [PATCH] common/hooks/do-fetch: support 'xbps-uhelper fetch's new '>'-destfile syntax. --- common/hooks/do-fetch/00-distfiles.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh index 19734de80ba..0384fd0f835 100644 --- a/common/hooks/do-fetch/00-distfiles.sh +++ b/common/hooks/do-fetch/00-distfiles.sh @@ -33,7 +33,8 @@ hook() { trap - ERR for f in ${distfiles}; do - curfile=$(basename $f) + curfile=$(basename "${f#*>}") + distfile="$srcdir/$curfile" while true; do flock -w 1 ${distfile}.part true @@ -69,7 +70,7 @@ hook() { msg_normal "$pkgver: fetching distfile '$curfile'...\n" if [ -n "$distfiles" ]; then - localurl="$f" + localurl="${f%>*}" else localurl="$url/$curfile" fi