fix variables

4 files changed, 16 insertions, 16 deletions

diff --git a/db-cleanup b/db-cleanup
index e62681f..9e9a21f 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -53,7 +53,7 @@ done
 
 msg "Removing old files:"
 
-for POOL in "${packages_poolS[@]}" "${sources_poolS[@]}"; do
+for POOL in "${packages_pools[@]}" "${sources_pools[@]}"; do
 	msg2 '%s' "${POOL}"
 
 	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
diff --git a/db-sync b/db-sync
index 6902828..9b87d50 100755
--- a/db-sync
+++ b/db-sync
@@ -145,7 +145,7 @@ init() {
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
 	# packages too
 	local pkgpool
-	for pkgpool in "${ARCHpackages_poolS[@]}"; do
+	for pkgpool in "${derivative_packages_pools[@]}"; do
 		rsync "${extra[@]}" --no-motd -rtlH \
 			--delay-updates \
 			--safe-links \
@@ -164,7 +164,7 @@ init() {
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
 	# packages too
 	local srcpool
-	for srcpool in "${ARCHsources_poolS[@]}"; do
+	for srcpool in "${derivative_sources_pools[@]}"; do
 		rsync "${extra[@]}" --no-motd -rtlH \
 			--delay-updates \
 			--safe-links \
@@ -192,7 +192,7 @@ source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
 source "$(dirname "$(readlink -e "$0")")/share/db-libremessages"
 
 # Check variables presence
-for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir ARCHsources_poolS ARCHpackages_poolS; do
+for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir derivative_sources_pools derivative_packages_pools; do
 	test -z "${!var}" && fatal_error "Empty %s" "${var}"
 done
 
diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
index 4e02705..b5a2a8a 100644
--- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
@@ -15,13 +15,13 @@ sources_pool='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-ARCHpackages_poolS=(pool/arch_gnu+linux-arm_main)
-OURpackages_poolS=(pool/parabola)
-packages_poolS=(${OURpackages_poolS[@]} ${ARCHpackages_poolS[@]})
+derivative_packages_pools=(pool/arch_gnu+linux-arm_main)
+native_packages_pools=(pool/parabola)
+packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]})
 # Directories where sources are stored
-ARCHsources_poolS=(sources/arch_gnu+linux-arm_main)
-OURpackages_poolS=(sources/parabola)
-sources_poolS=(${OURsources_poolS[@]} ${ARCHsources_poolS[@]})
+derivative_sources_pools=(sources/arch_gnu+linux-arm_main)
+native_packages_pools=(sources/parabola)
+sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]})
 
 derivative_architectures=('arm' 'armv6h' 'armv7h' 'aarch64')
 native_architectures=()
diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
index 49a676d..f9baa7e 100644
--- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
@@ -15,13 +15,13 @@ sources_pool='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-ARCHpackages_poolS=(pool/{packages,community})
-OURpackages_poolS=(pool/parabola)
-packages_poolS=(${OURpackages_poolS[@]} ${ARCHpackages_poolS[@]})
+derivative_packages_pools=(pool/{packages,community})
+native_packages_pools=(pool/parabola)
+packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]})
 # Directories where sources are stored
-ARCHsources_poolS=(sources/{packages,community})
-OURpackages_poolS=(sources/parabola)
-sources_poolS=(${OURsources_poolS[@]} ${ARCHsources_poolS[@]})
+derivative_sources_pools=(sources/{packages,community})
+native_packages_pools=(sources/parabola)
+sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]})
 
 derivative_architectures=('i686' 'x86_64')
 native_architectures=()