more quoting an printf fixes

1 files changed, 18 insertions, 18 deletions

diff --git a/db-update b/db-update
index f830e11..9a52e01 100755
--- a/db-update
+++ b/db-update
@@ -6,18 +6,18 @@
 shopt -s nullglob
 
 if [ $# -ge 1 ]; then
-	warning "Calling ${0##*/} with a specific repository is no longer supported"
+	warning "Calling %s with a specific repository is no longer supported" "${0##*/}"
 	exit 1
 fi
 
 # Find repos with packages to release
 staging_repos=($(find  "${STAGING}" -mindepth 1 -type f -name "*${PKGEXT}" -printf '%h\n' | sort -u))
 if [ $? -ge 1 ]; then
-	die "Could not read ${STAGING}"
+	die "Could not read %s" "${STAGING}"
 fi
 
 repos=()
-for staging_repo in ${staging_repos[@]##*/}; do
+for staging_repo in "${staging_repos[@]##*/}"; do
 	if in_array "${staging_repo}" "${PKGREPOS[@]}"; then
 		repos+=("${staging_repo}")
 	fi
@@ -26,7 +26,7 @@ done
 # TODO: this might lock too much (architectures)
 for repo in "${repos[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		repo_lock ${repo} ${pkgarch} || exit 1
+		repo_lock "${repo}" "${pkgarch}" || exit 1
 	done
 done
 
@@ -35,42 +35,42 @@ for repo in "${repos[@]}"; do
 	pkgs=($(getpkgfiles "${STAGING}/${repo}/"*${PKGEXT}))
 	if [ $? -eq 0 ]; then
 		if [ ${#pkgs[@]} -gt 0 ] && ! check_repo_permission "${repo}"; then
-			die "You don't have permission to update packages in ${repo}"
+			die "You don't have permission to update packages in %s" "${repo}"
 		fi
 		for pkg in "${pkgs[@]}"; do
 			if [ -h "${pkg}" ]; then
-				die "Package ${repo}/${pkg##*/} is a symbolic link"
+				die "Package %s is a symbolic link" "${repo}/${pkg##*/}"
 			fi
 			if ! check_pkgfile "${pkg}"; then
-				die "Package ${repo}/${pkg##*/} is not consistent with its meta data"
+				die "Package %s is not consistent with its meta data" "${repo}/${pkg##*/}"
 			fi
-			if ${REQUIRE_SIGNATURE} && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
-				die "Package ${repo}/${pkg##*/} does not have a valid signature"
+			if "${REQUIRE_SIGNATURE}" && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
+				die "Package %s does not have a valid signature" "${repo}/${pkg##*/}"
 			fi
 			if ! check_pkgxbs "${pkg}" "${repo}"; then
-				die "Package ${repo}/${pkg##*/} is not consistent with xbs"
+				die "Package %s is not consistent with XBS" "${repo}/${pkg##*/}"
 			fi
 			if ! check_pkgrepos "${pkg}"; then
-				die "Package ${repo}/${pkg##*/} already exists in another repository"
+				die "Package %s already exists in another repository" "${repo}/${pkg##*/}"
 			fi
 		done
-		if ! check_splitpkgs ${repo} ${pkgs[@]}; then
-			die "Missing split packages for ${repo}"
+		if ! check_splitpkgs "${repo}" "${pkgs[@]}"; then
+			die "Missing split packages for %s" "${repo}"
 		fi
 	else
-		die "Could not read ${STAGING}"
+		die "Could not read %s" "${STAGING}"
 	fi
 done
 
 for repo in "${repos[@]}"; do
-	msg "Updating [${repo}]..."
+	msg "Updating [%s]..." "${repo}"
 	any_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-any${PKGEXT} 2>/dev/null))
 	for pkgarch in "${ARCHES[@]}"; do
 		add_pkgs=()
-		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
+		arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-"${pkgarch}"${PKGEXT} 2>/dev/null))
 		for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
 			pkgfile="${pkg##*/}"
-			msg2 "${pkgfile} (${pkgarch})"
+			msg2 "%s (%s)" "${pkgfile}" "${pkgarch}"
 			# any packages might have been moved by the previous run
 			if [ -f "${pkg}" ]; then
 				mv "${pkg}" "$FTP_BASE/${PKGPOOL}"
@@ -93,7 +93,7 @@ done
 
 for repo in "${repos[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		repo_unlock ${repo} ${pkgarch}
+		repo_unlock "${repo}" "${pkgarch}"
 	done
 done