remove deprecated sources_pool and packages_pool variables

2 files changed, 5 insertions, 5 deletions

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index ad33b19..254b1c9 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -54,7 +54,7 @@ for repo in "${repositories[@]}"; do
 done
 
 # get a list of all available packages in the pacakge pool
-find "${root_dir}/${packages_pool}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
+find "${root_dir}/${native_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}/${packages_pool}/${old_pkg}"
+		clean_pkg "${root_dir}/${native_packages_pool}/${old_pkg}"
 	done
 fi
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 2e7b7be..d01b91b 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -46,7 +46,7 @@ for repo in "${repositories[@]}"; do
 done
 
 # Create a list of all available source package file names
-find "${root_dir}/${sources_pool}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
+find "${root_dir}/${native_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 "${repositories[@]}"; do
@@ -91,7 +91,7 @@ for repo in "${repositories[@]}"; 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}/${sources_pool}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
+				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${native_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}/${sources_pool}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
+			mv_acl "${root_dir}/${native_sources_pool}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
 			touch "${source_cleanup_destination_directory}/${old_pkg}"
 		fi
 	done