fix variables

3 files changed, 17 insertions, 17 deletions

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index fcf6879..43d5236 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -24,8 +24,8 @@ clean_pkg() {
 
 "${cleanup_dryrun}" && warning 'dry run mode is active'
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		if [ ! -f "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" ]; then
 			continue
 		fi
@@ -54,7 +54,7 @@ for repo in "${PKGREPOS[@]}"; do
 done
 
 # get a list of all available packages in the pacakge pool
-find "${root_dir}/${PKGPOOL}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
+find "${root_dir}/${packages_pool}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
 # create a list of packages in our db
 cat "${work_directory}/db-"* | sort -u > "${work_directory}/db"
 
@@ -63,7 +63,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from package pool..."
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
-		clean_pkg "${root_dir}/${PKGPOOL}/${old_pkg}"
+		clean_pkg "${root_dir}/${packages_pool}/${old_pkg}"
 	done
 fi
 
@@ -79,8 +79,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		repo_unlock "${repo}" "${arch}"
 	done
 done
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index f98e8fa..1963812 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -8,7 +8,7 @@ source "$(dirname "$(readlink -e "$0")")/../etc/dbscripts.cfg"
 source "$(dirname "$(readlink -e "$0")")/../share/db-functions"
 
 # Traverse all repos
-for _repo in "${PKGREPOS[@]}"; do
+for _repo in "${repositories[@]}"; do
 	msg "Cleaning up [%s]" "${_repo}"
 
 	# Find all pkgnames on this repo's abs
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index efa9523..efa9f09 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -7,8 +7,8 @@ pushd "${work_directory}" >/dev/null
 
 script_lock
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		repo_lock "${repo}" "${arch}" || exit 1
 	done
 done
@@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null
 
 # Create a readable file for each repo with the following format
 # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>]
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		# Repo does not exist; skip it
 		if [ ! -f "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" ]; then
 			continue
@@ -39,17 +39,17 @@ for repo in "${PKGREPOS[@]}"; do
 	done | sort -u > "${work_directory}/db-${repo}"
 done
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		repo_unlock "${repo}" "${arch}"
 	done
 done
 
 # Create a list of all available source package file names
-find "${root_dir}/${SRCPOOL}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
+find "${root_dir}/${sources_pool}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
-for repo in "${PKGREPOS[@]}"; do
+for repo in "${repositories[@]}"; do
 	newpkgs=()
 	failedpkgs=()
 	while read line; do
@@ -91,7 +91,7 @@ for repo in "${PKGREPOS[@]}"; do
 			pushd "${work_directory}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			SRCPKGDEST=. makepkg --nocolor --allsource --ignorearch --skippgpcheck >"${work_directory}/${pkgbase}.log" 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${source_extension_suffixfile}" ]; then
-				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${SRCPOOL}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
+				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${sources_pool}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${work_directory}/available-src-pkgs"
 				newpkgs+=("${pkgbase}-${pkgver}${source_extension_suffixfile}")
@@ -128,7 +128,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
 		if ! "${source_cleanup_dryrun}"; then
-			mv_acl "${root_dir}/${SRCPOOL}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
+			mv_acl "${root_dir}/${sources_pool}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
 			touch "${source_cleanup_destination_directory}/${old_pkg}"
 		fi
 	done