Improve quoting

You may verify that the only differences between the lines removed and
lines added are double-quotes:

	diff -u \
	  <(git show|sed -n 's/^-//p'|grep -v '^-- a/'|sed 's/"//g') \
	  <(git show|sed -n 's/^+//p'|grep -v '^++ b/'|sed 's/"//g')

19 files changed, 126 insertions, 126 deletions

diff --git a/config b/config
index 71c07aa..712b1f0 100644
--- a/config
+++ b/config
@@ -42,5 +42,5 @@ LIST="arch-dev-public@archlinux.org"
 FROM="repomaint@archlinux.org"
 
 # Override default config with config.local
-LOCAL_CONFIG=${DBSCRIPTS_CONFIG:-"$(dirname "${BASH_SOURCE[0]}")/config.local"}
+LOCAL_CONFIG=${DBSCRIPTS_CONFIG:-"$(dirname ${BASH_SOURCE[0]})/config.local"}
 [[ -f "${LOCAL_CONFIG}" ]] && . "${LOCAL_CONFIG}"
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index e64b7e4..55bac5c 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -38,7 +38,7 @@ for repo in "${PKGREPOS[@]}"; do
 			continue
 		fi
 		# get a list of actual available package files
-		for f in "${FTP_BASE}"/${repo}/os/${arch}/*${PKGEXTS}; do
+		for f in "${FTP_BASE}/${repo}/os/${arch}"/*${PKGEXTS}; do
 			if [[ -f $f ]]; then
 				printf '%s\n' "${f##*/}"
 			fi
diff --git a/db-functions b/db-functions
index a0b2e42..20a3267 100644
--- a/db-functions
+++ b/db-functions
@@ -488,7 +488,7 @@ arch_repo_modify() {
 
 	# package files for repo-add might be relative to repo dir
 	pushd "${dbfile%/*}" >/dev/null
-	/usr/bin/"repo-${action}" -q "${dbfile}" "${pkgs[@]}" \
+	/usr/bin/repo-${action} -q "${dbfile}" "${pkgs[@]}" \
 		|| error '%s' "repo-${action} ${dbfile@Q} ${pkgs[*]@Q}"
 	set_repo_permission "${repo}" "${arch}"
 	popd >/dev/null
diff --git a/db-update b/db-update
index 0f7ed1f..874abc1 100755
--- a/db-update
+++ b/db-update
@@ -94,7 +94,7 @@ for repo in "${repos[@]}"; do
 			add_pkgs+=("${pkgfile}")
 		done
 		if (( ${#add_pkgs[@]} >= 1 )); then
-			arch_repo_modify add "${repo}" "${pkgarch}" ${add_pkgs[@]}
+			arch_repo_modify add "${repo}" "${pkgarch}" "${add_pkgs[@]}"
 		fi
 	done
 done
diff --git a/test/cases/db-move.bats b/test/cases/db-move.bats
index eb77ef9..44f8124 100644..100755
--- a/test/cases/db-move.bats
+++ b/test/cases/db-move.bats
@@ -6,8 +6,8 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage testing "${pkgbase}"
 	done
 
 	db-update
@@ -25,17 +25,17 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage testing "${pkgbase}"
 	done
 
 	db-update
 
 	db-move testing extra pkg-simple-a pkg-simple-b
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedPackage testing ${pkgbase}
-		checkPackage extra ${pkgbase} 1-1
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedPackage testing "${pkgbase}"
+		checkPackage extra "${pkgbase}" 1-1
 	done
 }
 
@@ -64,8 +64,8 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage testing "${pkgbase}"
 	done
 
 	db-update
@@ -80,8 +80,8 @@ load ../lib/common
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage testing "${pkgbase}"
 	done
 
 	db-update
@@ -99,8 +99,8 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage testing "${pkgbase}"
 	done
 
 	db-update
diff --git a/test/cases/db-remove.bats b/test/cases/db-remove.bats
index 6853ee7..ffbe008 100644..100755
--- a/test/cases/db-remove.bats
+++ b/test/cases/db-remove.bats
@@ -6,20 +6,20 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
-	for pkgbase in ${pkgs[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
 		for arch in ${arches[@]}; do
-			db-remove extra ${arch} ${pkgbase}
+			db-remove extra "${arch}" "${pkgbase}"
 		done
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedPackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedPackage extra "${pkgbase}"
 	done
 }
 
@@ -29,18 +29,18 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
 	for arch in ${arches[@]}; do
-		db-remove extra ${arch} ${pkgs[@]}
+		db-remove extra "${arch}" "${pkgs[@]}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedPackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedPackage extra "${pkgbase}"
 	done
 }
 
@@ -63,17 +63,17 @@ load ../lib/common
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		db-remove extra any ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		db-remove extra any "${pkgbase}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedPackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedPackage extra "${pkgbase}"
 	done
 }
diff --git a/test/cases/db-repo-add.bats b/test/cases/db-repo-add.bats
index e49c2fa..6d76c76 100644..100755
--- a/test/cases/db-repo-add.bats
+++ b/test/cases/db-repo-add.bats
@@ -27,16 +27,16 @@ __movePackageToRepo() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "$pkgbase"
 		for arch in ${arches[@]}; do
 			__movePackageToRepo extra ${pkgbase} ${arch}
-			db-repo-add extra ${arch} ${pkgbase}-1-1-${arch}${PKGEXT}
+			db-repo-add extra "${arch}" "${pkgbase}-1-1-${arch}${PKGEXT}"
 		done
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkPackageDB extra ${pkgbase} 1-1
+	for pkgbase in "${pkgs[@]}"; do
+		checkPackageDB extra "${pkgbase}" 1-1
 	done
 }
 
@@ -46,21 +46,21 @@ __movePackageToRepo() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "$pkgbase"
 	done
 
 	for arch in ${arches[@]}; do
 		add_pkgs=()
-		for pkgbase in ${pkgs[@]}; do
+		for pkgbase in "${pkgs[@]}"; do
 			__movePackageToRepo extra ${pkgbase} ${arch}
 			add_pkgs+=("${pkgbase}-1-1-${arch}${PKGEXT}")
 		done
-		db-repo-add extra ${arch} ${add_pkgs[@]}
+		db-repo-add extra "${arch}" "${add_pkgs[@]}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkPackageDB extra ${pkgbase} 1-1
+	for pkgbase in "${pkgs[@]}"; do
+		checkPackageDB extra "${pkgbase}" 1-1
 	done
 }
 
diff --git a/test/cases/db-repo-remove.bats b/test/cases/db-repo-remove.bats
index 77bcc24..ddf78aa 100644..100755
--- a/test/cases/db-repo-remove.bats
+++ b/test/cases/db-repo-remove.bats
@@ -6,20 +6,20 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
-	for pkgbase in ${pkgs[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
 		for arch in ${arches[@]}; do
-			db-repo-remove extra ${arch} ${pkgbase}
+			db-repo-remove extra "${arch}" "${pkgbase}"
 		done
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedPackageDB extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedPackageDB extra "${pkgbase}"
 	done
 }
 
@@ -29,18 +29,18 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
 	for arch in ${arches[@]}; do
-		db-repo-remove extra ${arch} ${pkgs[@]}
+		db-repo-remove extra "${arch}" "${pkgs[@]}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedPackageDB extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedPackageDB extra "${pkgbase}"
 	done
 }
 
diff --git a/test/cases/db-update.bats b/test/cases/db-update.bats
index 8b557e3..837c507 100644..100755
--- a/test/cases/db-update.bats
+++ b/test/cases/db-update.bats
@@ -6,14 +6,14 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		checkPackage extra ${pkgbase} 1-1
+	for pkgbase in "${pkgs[@]}"; do
+		checkPackage extra "${pkgbase}" 1-1
 	done
 }
 
@@ -33,14 +33,14 @@ load ../lib/common
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		checkPackage extra ${pkgbase} 1-1
+	for pkgbase in "${pkgs[@]}"; do
+		checkPackage extra "${pkgbase}" 1-1
 	done
 }
 
@@ -51,14 +51,14 @@ load ../lib/common
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		checkPackage extra ${pkgbase} 1-1
+	for pkgbase in "${pkgs[@]}"; do
+		checkPackage extra "${pkgbase}" 1-1
 	done
 }
 
@@ -125,10 +125,10 @@ load ../lib/common
 	local pkgbase='pkg-split-a'
 	local arch
 
-	releasePackage ${repo} ${pkgbase}
+	releasePackage "${repo}" "${pkgbase}"
 
 	# remove a split package to make db-update fail
-	rm "${STAGING}"/extra/${pkgbase}1-*
+	rm "${STAGING}/extra/${pkgbase}1-"*
 
 	run db-update
 	[ "$status" -ne 0 ]
@@ -171,7 +171,7 @@ load ../lib/common
 	local s
 	releasePackage extra 'pkg-any-a'
 	for s in "${STAGING}"/extra/*.sig; do
-		echo 0 > $s
+		echo 0 > "$s"
 	done
 	run db-update
 	[ "$status" -ne 0 ]
diff --git a/test/cases/ftpdir-cleanup.bats b/test/cases/ftpdir-cleanup.bats
index de2d2d9..d601a10 100644..100755
--- a/test/cases/ftpdir-cleanup.bats
+++ b/test/cases/ftpdir-cleanup.bats
@@ -28,14 +28,14 @@ __checkRepoRemovedPackage() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
 	for arch in ${arches[@]}; do
-		db-remove extra ${arch} pkg-simple-a
+		db-remove extra "${arch}" pkg-simple-a
 	done
 
 	ftpdir-cleanup
@@ -54,14 +54,14 @@ __checkRepoRemovedPackage() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
 	for arch in ${arches[@]}; do
-		db-remove extra ${arch} pkg-simple-epoch
+		db-remove extra "${arch}" pkg-simple-epoch
 	done
 
 	ftpdir-cleanup
@@ -78,8 +78,8 @@ __checkRepoRemovedPackage() {
 	local pkgbase
 	local arch='any'
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
@@ -102,14 +102,14 @@ __checkRepoRemovedPackage() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
 	for arch in ${arches[@]}; do
-		db-remove extra ${arch} ${pkgs[0]}
+		db-remove extra "${arch}" "${pkgs[0]}"
 	done
 
 	ftpdir-cleanup
@@ -118,8 +118,8 @@ __checkRepoRemovedPackage() {
 		__checkRepoRemovedPackage extra ${pkgs[0]} ${arch}
 	done
 
-	checkRemovedPackage extra ${pkgs[0]}
-	checkPackage extra ${pkgs[1]} 1-1
+	checkRemovedPackage extra "${pkgs[0]}"
+	checkPackage extra "${pkgs[1]}" 1-1
 }
 
 @test "cleanup old packages" {
diff --git a/test/cases/sourceballs.bats b/test/cases/sourceballs.bats
index 930ad7a..92804de 100644..100755
--- a/test/cases/sourceballs.bats
+++ b/test/cases/sourceballs.bats
@@ -17,13 +17,13 @@ __checkRemovedSourcePackage() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 	db-update
 
 	sourceballs
-	for pkgbase in ${pkgs[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
 		__checkSourcePackage ${pkgbase}
 	done
 }
@@ -33,13 +33,13 @@ __checkRemovedSourcePackage() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 	db-update
 
 	sourceballs
-	for pkgbase in ${pkgs[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
 		__checkSourcePackage ${pkgbase}
 	done
 }
@@ -52,14 +52,14 @@ __checkRemovedSourcePackage() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 
 	db-update
 
 	sourceballs
-	for pkgbase in ${pkgs[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
 		__checkSourcePackage ${pkgbase}
 	done
 }
@@ -71,14 +71,14 @@ __checkRemovedSourcePackage() {
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}"
 	done
 	db-update
 	sourceballs
 
 	for arch in ${arches[@]}; do
-		db-remove extra ${arch} pkg-simple-a
+		db-remove extra "${arch}" pkg-simple-a
 	done
 
 	sourceballs
diff --git a/test/fixtures/pkg-any-a/PKGBUILD b/test/fixtures/pkg-any-a/PKGBUILD
index cf2774b..9996cdc 100644
--- a/test/fixtures/pkg-any-a/PKGBUILD
+++ b/test/fixtures/pkg-any-a/PKGBUILD
@@ -8,6 +8,6 @@ license=('GPL')
 options=(!strip)
 
 package() {
-	install -d ${pkgdir}/usr/share/${pkgname}
-	:>${pkgdir}/usr/share/${pkgname}/test
+	install -d "${pkgdir}"/usr/share/${pkgname}
+	:>"${pkgdir}"/usr/share/${pkgname}/test
 }
diff --git a/test/fixtures/pkg-any-b/PKGBUILD b/test/fixtures/pkg-any-b/PKGBUILD
index 05dfd10..ce30461 100644
--- a/test/fixtures/pkg-any-b/PKGBUILD
+++ b/test/fixtures/pkg-any-b/PKGBUILD
@@ -8,6 +8,6 @@ license=('GPL')
 options=(!strip)
 
 package() {
-	install -d ${pkgdir}/usr/share/${pkgname}
-	:>${pkgdir}/usr/share/${pkgname}/test
+	install -d "${pkgdir}"/usr/share/${pkgname}
+	:>"${pkgdir}"/usr/share/${pkgname}/test
 }
diff --git a/test/fixtures/pkg-simple-a/PKGBUILD b/test/fixtures/pkg-simple-a/PKGBUILD
index eaa841b..3cfad00 100644
--- a/test/fixtures/pkg-simple-a/PKGBUILD
+++ b/test/fixtures/pkg-simple-a/PKGBUILD
@@ -9,5 +9,5 @@ depends=('glibc')
 options=(!strip)
 
 package() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
diff --git a/test/fixtures/pkg-simple-b/PKGBUILD b/test/fixtures/pkg-simple-b/PKGBUILD
index 287eee7..e16dbc5 100644
--- a/test/fixtures/pkg-simple-b/PKGBUILD
+++ b/test/fixtures/pkg-simple-b/PKGBUILD
@@ -9,5 +9,5 @@ depends=('glibc')
 options=(!strip)
 
 package() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
diff --git a/test/fixtures/pkg-simple-epoch/PKGBUILD b/test/fixtures/pkg-simple-epoch/PKGBUILD
index c624439..a19572b 100644
--- a/test/fixtures/pkg-simple-epoch/PKGBUILD
+++ b/test/fixtures/pkg-simple-epoch/PKGBUILD
@@ -10,5 +10,5 @@ depends=('glibc')
 options=(!strip)
 
 package() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
diff --git a/test/fixtures/pkg-split-a/PKGBUILD b/test/fixtures/pkg-split-a/PKGBUILD
index 2c91390..05d48d3 100644
--- a/test/fixtures/pkg-split-a/PKGBUILD
+++ b/test/fixtures/pkg-split-a/PKGBUILD
@@ -10,9 +10,9 @@ depends=('glibc')
 options=(!strip)
 
 package_pkg-split-a1() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
 
 package_pkg-split-a2() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
diff --git a/test/fixtures/pkg-split-b/PKGBUILD b/test/fixtures/pkg-split-b/PKGBUILD
index 1d07827..cf455fd 100644
--- a/test/fixtures/pkg-split-b/PKGBUILD
+++ b/test/fixtures/pkg-split-b/PKGBUILD
@@ -10,9 +10,9 @@ depends=('glibc')
 options=(!strip)
 
 package_pkg-split-b1() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
 
 package_pkg-split-b2() {
-	install -D -m755 /bin/true ${pkgdir}/usr/bin/${pkgname}
+	install -D -m755 /bin/true "${pkgdir}"/usr/bin/${pkgname}
 }
diff --git a/test/lib/common.bash b/test/lib/common.bash
index 8fc1bdb..2265fa0 100644
--- a/test/lib/common.bash
+++ b/test/lib/common.bash
@@ -94,9 +94,9 @@ eot
 
 	mkdir -p "${TMP}/"{ftp,tmp,staging,{package,source}-cleanup}
 
-	for r in ${PKGREPOS[@]}; do
+	for r in "${PKGREPOS[@]}"; do
 		mkdir -p "${TMP}/staging/${r}"
-		for a in ${ARCHES[@]}; do
+		for a in "${ARCHES[@]}"; do
 			mkdir -p "${TMP}/ftp/${r}/os/${a}"
 		done
 	done
@@ -160,35 +160,35 @@ checkPackageDB() {
 	local pkgnames=($(. "fixtures/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
 
 	if [[ ${pkgarches[@]} == any ]]; then
-		repoarches=(${ARCHES[@]})
+		repoarches=("${ARCHES[@]}")
 	else
-		repoarches=(${pkgarches[@]})
+		repoarches=("${pkgarches[@]}")
 	fi
 
 	for pkgarch in ${pkgarches[@]}; do
 		for pkgname in ${pkgnames[@]}; do
 			pkgfile="${pkgname}-${pkgver}-${pkgarch}${PKGEXT}"
 
-			[ -r ${FTP_BASE}/${PKGPOOL}/${pkgfile} ]
-			[ -r ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]
-			[ ! -r ${STAGING}/${repo}/${pkgfile} ]
-			[ ! -r ${STAGING}/${repo}/${pkgfile}.sig ]
+			[ -r "${FTP_BASE}/${PKGPOOL}/${pkgfile}" ]
+			[ -r "${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig" ]
+			[ ! -r "${STAGING}/${repo}/${pkgfile}" ]
+			[ ! -r "${STAGING}/${repo}/${pkgfile}.sig" ]
 
-			for repoarch in ${repoarches[@]}; do
+			for repoarch in "${repoarches[@]}"; do
 				# Only 'any' packages can be found in repos of both arches
 				if [[ $pkgarch != any ]]; then
-					if [[ $pkgarch != ${repoarch} ]]; then
+					if [[ $pkgarch != "$repoarch" ]]; then
 						continue
 					fi
 				fi
 
-				[ -L ${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile} ]
-				[ "$(readlink -e ${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile})" == ${FTP_BASE}/${PKGPOOL}/${pkgfile} ]
+				[ -L "${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile}" ]
+				[ "$(readlink -e "${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile}")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkgfile}")" ]
 
-				[ -L ${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile}.sig ]
-				[ "$(readlink -e ${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile}.sig)" == ${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig ]
+				[ -L "${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile}.sig" ]
+				[ "$(readlink -e "${FTP_BASE}/${repo}/os/${repoarch}/${pkgfile}.sig")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig")" ]
 
-				for db in ${DBEXT} ${FILESEXT}; do
+				for db in "${DBEXT}" "${FILESEXT}"; do
 					[ -r "${FTP_BASE}/${repo}/os/${repoarch}/${repo}${db%.tar.*}" ]
 					bsdtar -xf "${FTP_BASE}/${repo}/os/${repoarch}/${repo}${db%.tar.*}" -O | grep "${pkgfile%${PKGEXT}}" &>/dev/null
 				done
@@ -213,7 +213,7 @@ checkRemovedPackage() {
 
 	vcsCheckRemovedPackage "$repo" "$pkgbase"
 
-	checkRemovedPackageDB $repo $pkgbase
+	checkRemovedPackageDB "$repo" "$pkgbase"
 }
 
 checkRemovedPackageDB() {
@@ -236,11 +236,11 @@ checkRemovedPackageDB() {
 		tarches=(${pkgarches[@]})
 	fi
 
-	for db in ${DBEXT} ${FILESEXT}; do
-		for tarch in ${tarches[@]}; do
+	for db in "${DBEXT}" "${FILESEXT}"; do
+		for tarch in "${tarches[@]}"; do
 			if [ -r "${FTP_BASE}/${repo}/os/${tarch}/${repo}${db%.tar.*}" ]; then
 				for pkgname in ${pkgnames[@]}; do
-					if bsdtar -xf "${FTP_BASE}/${repo}/os/${tarch}/${repo}${db%.tar.*}" -O | grep ${pkgname} &>/dev/null; then
+					if bsdtar -xf "${FTP_BASE}/${repo}/os/${tarch}/${repo}${db%.tar.*}" -O | grep "${pkgname}" &>/dev/null; then
 						return 1
 					fi
 				done