From 6638878c5eb6d5116580d06cc3042a5e9beacb7e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 20:33:06 -0400
Subject: Use printf-formatters instead of string interpolation on msg, error,
 etc.

---
 cron-jobs/ftpdir-cleanup  | 12 ++++++------
 cron-jobs/integrity-check |  2 +-
 cron-jobs/sourceballs     | 12 ++++++------
 cron-jobs/update-web-db   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index a2820e1..f6487cf 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -44,17 +44,17 @@ for repo in "${PKGREPOS[@]}"; do
 
 		missing_pkgs=($(comm -13 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}"))
 		if [ ${#missing_pkgs[@]} -ge 1 ]; then
-			error "Missing packages in [${repo}] (${arch})..."
+			error "Missing packages in [%s] (%s)..." "${repo}" "${arch}"
 			for missing_pkg in "${missing_pkgs[@]}"; do
-				msg2 "${missing_pkg}"
+				msg2 '%s' "${missing_pkg}"
 			done
 		fi
 
 		old_pkgs=($(comm -23 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}"))
 		if [ ${#old_pkgs[@]} -ge 1 ]; then
-			msg "Removing old packages from [${repo}] (${arch})..."
+			msg "Removing old packages from [%s] (%s)..." "${repo}" "${arch}"
 			for old_pkg in "${old_pkgs[@]}"; do
-				msg2 "${old_pkg}"
+				msg2 '%s' "${old_pkg}"
 				clean_pkg "${FTP_BASE}/${repo}/os/${arch}/${old_pkg}"
 			done
 		fi
@@ -70,7 +70,7 @@ old_pkgs=($(comm -23 "${WORKDIR}/pool" "${WORKDIR}/db"))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from package pool..."
 	for old_pkg in "${old_pkgs[@]}"; do
-		msg2 "${old_pkg}"
+		msg2 '%s' "${old_pkg}"
 		clean_pkg "$FTP_BASE/${PKGPOOL}/${old_pkg}"
 	done
 fi
@@ -79,7 +79,7 @@ old_pkgs=($(find "${CLEANUP_DESTDIR}" -type f -name "*${PKGEXT}" -mtime +"${CLEA
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from the cleanup directory..."
 	for old_pkg in "${old_pkgs[@]}"; do
-		msg2 "${old_pkg}"
+		msg2 '%s' "${old_pkg}"
 		if ! "${CLEANUP_DRYRUN}"; then
 			rm -f "${CLEANUP_DESTDIR}/${old_pkg}"
 			rm -f "${CLEANUP_DESTDIR}/${old_pkg}.sig"
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index e77eac7..677c0d3 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -8,7 +8,7 @@ dirname="$(dirname "$0")"
 script_lock
 
 if [ $# -ne 1 ]; then
-	die "usage: ${0##*/} <mailto>"
+	die "usage: %s <mailto>" "${0##*/}"
 fi
 mailto=$1
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index dee849a..0c2f9f9 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -103,15 +103,15 @@ for repo in "${PKGREPOS[@]}"; do
 	done < "${WORKDIR}/db-${repo}"
 
 	if [ ${#newpkgs[@]} -ge 1 ]; then
-		msg "Adding source packages for [${repo}]..."
+		msg "Adding source packages for [%s]..." "${repo}"
 		for new_pkg in "${newpkgs[@]}"; do
-			msg2 "${new_pkg}"
+			msg2 '%s' "${new_pkg}"
 		done
 	fi
 	if [ ${#failedpkgs[@]} -ge 1 ]; then
-		msg "Failed to create source packages for [${repo}]..."
+		msg "Failed to create source packages for [%s]..." "${repo}"
 		for failed_pkg in "${failedpkgs[@]}"; do
-			msg2 "${failed_pkg}"
+			msg2 '%s' "${failed_pkg}"
 		done
 	fi
 done
@@ -125,7 +125,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages..."
 	"${SOURCE_CLEANUP_DRYRUN}" && warning 'dry run mode is active'
 	for old_pkg in "${old_pkgs[@]}"; do
-		msg2 "${old_pkg}"
+		msg2 '%s' "${old_pkg}"
 		if ! "${SOURCE_CLEANUP_DRYRUN}"; then
 			mv_acl "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
@@ -137,7 +137,7 @@ old_pkgs=($(find "${SOURCE_CLEANUP_DESTDIR}" -type f -name "*${SRCEXT}" -mtime +
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages from the cleanup directory..."
 	for old_pkg in "${old_pkgs[@]}"; do
-		msg2 "${old_pkg}"
+		msg2 '%s' "${old_pkg}"
 		"${SOURCE_CLEANUP_DRYRUN}" || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 	done
 fi
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 1a725dc..88bf464 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -16,7 +16,7 @@ LOGOUT="/tmp/archweb_update.log"
 # figure out what operation to perform
 cmd="${0##*/}"
 if [[ $cmd != "update-web-db" && $cmd != "update-web-files-db" ]]; then
-	die "Invalid command name '$cmd' specified!"
+	die "Invalid command name '%s' specified!" "$cmd"
 fi
 
 script_lock
-- 
cgit v1.2.3