From 60881150977e7681278898aceb1df8fcab1ecdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sat, 4 Feb 2017 00:27:00 +0000 Subject: vars/build.vars, patches/bind-9.11.0-P2.local.patch: adds bind v9.11.0-P2 (via Redfoxmoon.) subr/pkg_fetch.subr: force ${PKG_FNAME} in pkgp_fetch(). --- subr/pkg_fetch.subr | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'subr/pkg_fetch.subr') diff --git a/subr/pkg_fetch.subr b/subr/pkg_fetch.subr index f7da99fe..5c2fee73 100644 --- a/subr/pkg_fetch.subr +++ b/subr/pkg_fetch.subr @@ -6,7 +6,11 @@ # N.B. URLs ($1) may contain `?' or '&' characters. pkgp_fetch() { _f_url="${1}"; _f_sha256sum_src="${2}"; - _f_url_dst="${DLCACHEDIR}/$(basename "${_f_url}")"; + if [ -z "${3}" ]; then + _f_url_dst="${DLCACHEDIR}/$(basename "${_f_url}")"; + else + _f_url_dst="${DLCACHEDIR}/${3}"; + fi; if [ ${ARG_OFFLINE:-0} -eq 1 ]\ || [ -e ${_f_url_dst}.fetched ]; then unset _f_url _f_sha256sum_src _f_url_dst; @@ -72,7 +76,7 @@ pkg_fetch() { fi; else if [ -n "${PKG_URL}" ]; then - pkgp_fetch ${PKG_URL} ${PKG_SHA256SUM}; + pkgp_fetch ${PKG_URL} ${PKG_SHA256SUM} ${PKG_FNAME}; fi; if [ -n "${PKG_URLS_GIT}" ]; then pkgp_fetch_urls_git ${PKG_URLS_GIT}; -- cgit v1.2.3