From 386c2d00249eb244bbcc9a173a64f9435b70180a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 13:45:10 -0400
Subject: Use printf formatters instead of string interpolation.

I used this command to find them:

    egrep -r --exclude-dir={test,.git} '(plain|msg|msg2|warning|error|stat_busy|stat_done|abort|die)\s+"?[^"]*\$'
---
 cron-jobs/ftpdir-cleanup    | 12 ++++++------
 cron-jobs/integrity-check   |  2 +-
 cron-jobs/repo-sanity-check |  4 ++--
 cron-jobs/sourceballs       | 12 ++++++------
 cron-jobs/sourceballs2      |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index d5a277b..04ca6c9 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -36,17 +36,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
@@ -62,7 +62,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
@@ -71,7 +71,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 33a4eb6..7459380 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -8,7 +8,7 @@ dirname="$(dirname "$(readlink -e "$0")")"
 script_lock
 
 if [ $# -ne 1 ]; then
-	die "usage: ${0##*/} <mailto>"
+	die "usage: %s <mailto>" "${0##*/}"
 fi
 mailto=$1
 
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 105bac4..012b544 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -6,7 +6,7 @@
 
 # Traverse all repos
 for _repo in "${PKGREPOS[@]}"; do
-	msg "Cleaning up [${_repo}]"
+	msg "Cleaning up [%s]" "${_repo}"
 
 	# Find all pkgnames on this repo's abs
 	on_abs=($(
@@ -30,7 +30,7 @@ for _repo in "${PKGREPOS[@]}"; do
 
 	# quit if abs is empty
 	if [ ${#on_abs[*]} -eq 0 ]; then
-		warning "[${_repo}]'s ABS tree is empty, skipping"
+		warning "[%s]'s ABS tree is empty, skipping" "${_repo}"
 		break
 	fi
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 9c07c22..5ce7cfd 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -108,15 +108,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
@@ -130,7 +130,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 "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
@@ -142,7 +142,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/sourceballs2 b/cron-jobs/sourceballs2
index f7b3779..c431e9f 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -22,14 +22,14 @@ find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 pushd "${SVNREPO}" >/dev/null
 
 for repo in "${PKGREPOS[@]}"; do
-	msg "Sourceballing [${repo}]"
+	msg "Sourceballing [%s]" "${repo}"
 
 	pushd "$repo" >/dev/null
 	find -maxdepth 1 -type d | while read pkg; do
 		pushd "${SVNREPO}/$repo/$pkg" >/dev/null
 
 		[[ ! -e ./PKGBUILD ]] && {
-			warning "$repo/$pkg is not a package"
+			warning "%s is not a package" "$repo/$pkg"
 			continue
 		}
 
-- 
cgit v1.2.3