From 089ed9480d37aab8c613c3562aca0eb545d71762 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Sat, 7 Jul 2018 04:59:50 -0400
Subject: s/svn/vcs/ where appropriate

This does not make any "real" changes, it just gets rid of saying "svn" in
function-names, variable-names, file-names, and comments; when the code is
actually now VCS-agnostic.

This makes no changes more sophisticated than the simple search/replace.
---
 cron-jobs/sourceballs |  2 +-
 db-functions          | 20 ++++++++++----------
 db-move               |  2 +-
 db-update             |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 5297a54..4306b81 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -72,7 +72,7 @@ for repo in "${PKGREPOS[@]}"; do
 				continue
 			fi
 
-			# Get the sources from svn
+			# Get the sources from vcs
 			mkdir -p -m0770 "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}"
 			vcs_export "$repo" "$pkgarch" "$pkgbase" \
 				"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}"
diff --git a/db-functions b/db-functions
index d89382d..c1576f4 100644
--- a/db-functions
+++ b/db-functions
@@ -298,7 +298,7 @@ check_pkgfile() {
 	[[ ${pkgfile##*/} = "${pkgname}-${pkgver}-${pkgarch}"* ]]
 }
 
-check_pkgsvn() {
+check_pkgvcs() {
 	local pkgfile="${1}"
 	local _pkgbase="$(getpkgbase "${pkgfile}")" || return 1
 	local _pkgname="$(getpkgname "${pkgfile}")" || return 1
@@ -314,11 +314,11 @@ check_pkgsvn() {
 			"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null || return 1
 	fi
 
-	local svnver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}/PKGBUILD"; get_full_version)"
-	[[ "${svnver}" = "${_pkgver}" ]] || return 1
+	local vcsver="$(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}/PKGBUILD"; get_full_version)"
+	[[ "${vcsver}" = "${_pkgver}" ]] || return 1
 
-	local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}/PKGBUILD"; echo "${pkgname[@]}"))
-	in_array "${_pkgname}" "${svnnames[@]}" || return 1
+	local vcsnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}/PKGBUILD"; echo "${pkgname[@]}"))
+	in_array "${_pkgname}" "${vcsnames[@]}" || return 1
 
 	return 0
 }
@@ -329,7 +329,7 @@ check_splitpkgs() {
 	local pkgfiles=("${@}")
 	local pkgfile
 	local pkgdir
-	local svnname
+	local vcsname
 
 	mkdir -p "${WORKDIR}/check_splitpkgs/"
 	pushd "${WORKDIR}/check_splitpkgs" >/dev/null
@@ -348,16 +348,16 @@ check_splitpkgs() {
 				"${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" >/dev/null || return 1
 		fi
 
-		local svnnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}/PKGBUILD"; echo "${pkgname[@]}"))
-		printf '%s\n' "${svnnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/svn"
+		local vcsnames=($(. "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}/PKGBUILD"; echo "${pkgname[@]}"))
+		printf '%s\n' "${vcsnames[@]}" >> "${repo}/${_pkgarch}/${_pkgbase}/vcs"
 	done
 	popd >/dev/null
 
 	for pkgdir in "${WORKDIR}/check_splitpkgs/${repo}"/*/*; do
 		[[ ! -d ${pkgdir} ]] && continue
 		sort -u "${pkgdir}/staging" -o "${pkgdir}/staging"
-		sort -u "${pkgdir}/svn" -o "${pkgdir}/svn"
-		if [[ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/svn")" ]]; then
+		sort -u "${pkgdir}/vcs" -o "${pkgdir}/vcs"
+		if [[ ! -z "$(comm -13 "${pkgdir}/staging" "${pkgdir}/vcs")" ]]; then
 			return 1
 		fi
 	done
diff --git a/db-move b/db-move
index e03f36b..b02bc44 100755
--- a/db-move
+++ b/db-move
@@ -24,7 +24,7 @@ for pkgarch in "${ARCHES[@]}"; do
 	repo_lock "${repo_from}" "${pkgarch}" || exit 1
 done
 
-# check if packages to be moved exist in svn and ftp dir
+# check if packages to be moved exist in vcs and ftp dir
 for pkgbase in "${args[@]:2}"; do
 	found=false
 	for tarch in "${ARCHES[@]}"; do
diff --git a/db-update b/db-update
index c9b727a..0f7ed1f 100755
--- a/db-update
+++ b/db-update
@@ -46,7 +46,7 @@ for repo in "${repos[@]}"; do
 			if ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
 				die "Package %s does not have a valid signature" "$repo/${pkg##*/}"
 			fi
-			if ! check_pkgsvn "${pkg}" "${repo}"; then
+			if ! check_pkgvcs "${pkg}" "${repo}"; then
 				die "Package %s is not consistent with %s repository" "$repo/${pkg##*/}" "$VCS"
 			fi
 			if ! check_pkgrepos "${pkg}"; then
-- 
cgit v1.2.2