[dbscripts,1/2] db-move: Don't store filepaths as a string with whitespace splitting

Message ID 20180702130154.16755-1-eschwartz@archlinux.org
State Accepted
Headers show
Series
  • [dbscripts,1/2] db-move: Don't store filepaths as a string with whitespace splitting
Related show

Commit Message

Eli Schwartz via arch-projects July 2, 2018, 1:01 p.m. UTC
Use arrays via nameref, since makepkg does not support multidimensional
arrays, and assigning to/retrieving from an array variable with an
unknown name requires this.

Requires bash 4.3, requires that architectures never contain chars that
are invalid in a variable name -- which makepkg explicitly requires in
order to support architecture-dependent sources/dependencies, and also
incorporates into linting checks which forbid anything but [[:alnum:]_]
so that's all good.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 db-move | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Patch

diff --git a/db-move b/db-move
index 63e5c14c..c4da5bf9 100755
--- a/db-move
+++ b/db-move
@@ -60,8 +60,10 @@  done
 
 msg "Moving packages from [%s] to [%s]..." "$repo_from" "$repo_to"
 
-declare -A add_pkgs
-declare -A remove_pkgs
+for arch in "${ARCHES[@]}"; do
+	declare -a add_pkgs_$arch
+	declare -a remove_pkgs_$arch
+done
 for pkgbase in "${args[@]:2}"; do
 	tag_list=""
 	for pkgarch in "${ARCHES[@]}" 'any'; do
@@ -95,6 +97,8 @@  for pkgbase in "${args[@]:2}"; do
 
 			for pkgname in "${pkgnames[@]}"; do
 				for tarch in "${tarches[@]}"; do
+					declare -n add_pkgs="add_pkgs_${tarch}"
+					declare -n remove_pkgs="remove_pkgs_${tarch}"
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXTS})
 					pkgfile="${pkgpath##*/}"
 
@@ -102,8 +106,8 @@  for pkgbase in "${args[@]:2}"; do
 					if [[ -f ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]]; then
 						ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
 					fi
-					add_pkgs[${tarch}]+="${FTP_BASE}/${PKGPOOL}/${pkgfile} "
-					remove_pkgs[${tarch}]+="${pkgname} "
+					add_pkgs+=("${FTP_BASE}/${PKGPOOL}/${pkgfile}")
+					remove_pkgs+=("${pkgname}")
 				done
 			done
 		fi
@@ -113,9 +117,11 @@  for pkgbase in "${args[@]:2}"; do
 done
 
 for tarch in "${ARCHES[@]}"; do
-	if [[ -n ${add_pkgs[${tarch}]} ]]; then
-		arch_repo_modify add "${repo_to}" "${tarch}" ${add_pkgs[${tarch}]}
-		arch_repo_modify remove "${repo_from}" "${tarch}" ${remove_pkgs[${tarch}]}
+	declare -n add_pkgs="add_pkgs_${tarch}"
+	declare -n remove_pkgs="remove_pkgs_${tarch}"
+	if [[ -n ${add_pkgs[@]} ]]; then
+		arch_repo_modify add "${repo_to}" "${tarch}" "${add_pkgs[@]}"
+		arch_repo_modify remove "${repo_from}" "${tarch}" "${remove_pkgs[@]}"
 	fi
 done