From 32ad217d197203a97dfcc0076e748731d2315c0b 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: Wed, 22 Nov 2017 01:32:50 +0000 Subject: subr/*: reorganised as {ex{,_{pkg,rtl,setup}},pkg}_*. --- subr/pkg_fetch_git.subr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'subr/pkg_fetch_git.subr') diff --git a/subr/pkg_fetch_git.subr b/subr/pkg_fetch_git.subr index 0ff61ae2..8340ca4f 100644 --- a/subr/pkg_fetch_git.subr +++ b/subr/pkg_fetch_git.subr @@ -6,20 +6,20 @@ pkgp_fetch_git() { local _tgtdir="${1}" _subdir="${2}" _url="${3}" _branch="${4}"; if [ "${ARG_OFFLINE:-0}" -eq 0 ]; then if [ -e "${DLCACHEDIR}/${_subdir}" ]; then - (build_fileop cd "${DLCACHEDIR}/${_subdir}" &&\ + (ex_build_fileop cd "${DLCACHEDIR}/${_subdir}" &&\ git pull origin "${_branch:-main}"); else git clone "${_url}" "${DLCACHEDIR}/${_subdir}"; if [ -n "${_branch}" -a \ \( -z "${_branch#main}" \) -a \ \( -z "${_branch#master}" \) ]; then - (build_fileop cd "${DLCACHEDIR}/${_subdir}" &&\ + (ex_build_fileop cd "${DLCACHEDIR}/${_subdir}" &&\ git checkout -b "${_branch}"); fi; fi; fi; - build_fileop rm "${_tgtdir}/${_subdir}"; - build_fileop cp "${DLCACHEDIR}/${_subdir}" "${_tgtdir}"; + ex_build_fileop rm "${_tgtdir}/${_subdir}"; + ex_build_fileop cp "${DLCACHEDIR}/${_subdir}" "${_tgtdir}"; }; pkgp_fetch_urls_git() { -- cgit v1.2.3