Merge branch 'master' into lukeshu/xbs

Conflicts:
	any-to-ours
	create-repo
	cron-jobs/ftpdir-cleanup
	cron-jobs/repo-sanity-check
	cron-jobs/sourceballs
	cron-jobs/sourceballs2
	db-check-nonfree
	db-cleanup
	db-functions
	db-move
	db-remove
	db-sync
	db-update
	libremessages
	testing2x

1 files changed, 17 insertions, 17 deletions

diff --git a/testing2x b/testing2x
index 6646179..b76438b 100755
--- a/testing2x
+++ b/testing2x
@@ -4,35 +4,35 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 1 ]; then
-	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
+	msg "usage: %s <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
 # Lock everything to reduce possibility of interfering task between the different repo-updates
 script_lock
-for repo in  ${TESTING_REPO} ${STABLE_REPOS[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
-		repo_lock ${repo} ${pkgarch} || exit 1
+for repo in  "${TESTING_REPO}" "${STABLE_REPOS[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
+		repo_lock "${repo}" "${pkgarch}" || exit 1
 	done
 done
 
 declare -A pkgs
 
-for pkgbase in $*; do
+for pkgbase in "$@"; do
 	if [ ! -d "${WORKDIR}/${pkgbase}" ]; then
 		found_source=false
-		for pkgarch in ${ARCHES[@]} 'any'; do
-			xbsrepo_from="$(xbs releasepath ${pkgbase} ${TESTING_REPO} ${pkgarch})"
+		for pkgarch in "${ARCHES[@]}" 'any'; do
+			xbsrepo_from="$(xbs releasepath "${pkgbase}" "${TESTING_REPO}" "${pkgarch}")"
 			if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
 				found_source=true
 				break
 			fi
 		done
-		${found_source} || die "${pkgbase} not found in [${TESTING_REPO}]"
+		"${found_source}" || die "%s not found in [%s]" "${pkgbase}" "${TESTING_REPO}"
 		found_target=false
-		for pkgarch in ${ARCHES[@]} 'any'; do
-			for repo in ${STABLE_REPOS[@]}; do
-				xbsrepo_to="$(xbs releasepath ${pkgbase} ${repo} ${pkgarch})"
+		for pkgarch in "${ARCHES[@]}" 'any'; do
+			for repo in "${STABLE_REPOS[@]}"; do
+				xbsrepo_to="$(xbs releasepath "${pkgbase}" "${repo}" "${pkgarch}")"
 				if [ -r "${xbsrepo_to}/PKGBUILD" ]; then
 					found_target=true
 					pkgs[${repo}]+="${pkgbase} "
@@ -40,16 +40,16 @@ for pkgbase in $*; do
 				fi
 			done
 		done
-		${found_target} || die "${pkgbase} not found in any of these repos: ${STABLE_REPOS[@]}"
+		"${found_target}" || die "%s not found in any of these repos: %s" "${pkgbase}" "${STABLE_REPOS[*]}"
 	fi
 done
 
-for pkgarch in ${ARCHES[@]}; do
-	repo_unlock ${TESTING_REPO} ${pkgarch}
+for pkgarch in "${ARCHES[@]}"; do
+	repo_unlock "${TESTING_REPO}" "${pkgarch}"
 done
-for repo in  ${STABLE_REPOS[@]}; do
-	for pkgarch in ${ARCHES[@]}; do
-		repo_unlock ${repo} ${pkgarch}
+for repo in  "${STABLE_REPOS[@]}"; do
+	for pkgarch in "${ARCHES[@]}"; do
+		repo_unlock "${repo}" "${pkgarch}"
 	done
 	if [ -n "${pkgs[${repo}]}" ]; then
 		"$(dirname "$(readlink -e "$0")")/db-move" ${TESTING_REPO} "${repo}" ${pkgs[${repo}]}