From ec19f02f81c206f54a89ef7e1f49715e90470c31 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?= <lucio@lucioillanes.de>
Date: Sun, 3 Dec 2017 16:10:05 +0000
Subject: Separate front end (build.sh, subr/build_*) from dispatcher.

---
 subr/pkg_fetch_git.subr | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

(limited to 'subr/pkg_fetch_git.subr')

diff --git a/subr/pkg_fetch_git.subr b/subr/pkg_fetch_git.subr
index 8340ca4f..67c05458 100644
--- a/subr/pkg_fetch_git.subr
+++ b/subr/pkg_fetch_git.subr
@@ -2,47 +2,9 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkgp_fetch_git() {
-	local _tgtdir="${1}" _subdir="${2}" _url="${3}" _branch="${4}";
-	if [ "${ARG_OFFLINE:-0}" -eq 0 ]; then
-		if [ -e "${DLCACHEDIR}/${_subdir}" ]; then
-			(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
-				(ex_build_fileop cd "${DLCACHEDIR}/${_subdir}"	&&\
-					git checkout -b "${_branch}");
-			fi;
-		fi;
-	fi;
-	ex_build_fileop rm "${_tgtdir}/${_subdir}";
-	ex_build_fileop cp "${DLCACHEDIR}/${_subdir}" "${_tgtdir}";
-};
-
-pkgp_fetch_urls_git() {
-	local _tgtdir _url_spec _subdir _url _git_branch;
-	_tgtdir="${1}"; shift; 
-	for _url_spec in "${@}"; do
-		_subdir="${_url_spec%=*}";
-		_url="${_url_spec#*=}";
-		_url="${_url%@*}";
-		if [ "${_url_spec#*@}" != "${_url_spec}" ]; then
-			_git_branch=${_url_spec#*@};
-		fi;
-		pkgp_fetch_git "${_tgtdir}" "${_subdir}" "${_url}" "${_git_branch}";
-	done;
-};
-
 pkg_fetch_git() {
-	if [ ${#} -gt 0 ]; then
-		pkgp_fetch_urls_git "${PKG_BASE_DIR}" "${@}";
-	else
-		if [ -n "${PKG_URLS_GIT}" ]; then
-			pkgp_fetch_urls_git "${PKG_BASE_DIR}" ${PKG_URLS_GIT};
-		fi;
+	if [ -n "${PKG_URLS_GIT}" ]; then
+		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" ${PKG_URLS_GIT};
 	fi;
 };
 
-- 
cgit v1.2.3