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+"?[^"]*\$'
---
 any-to-ours                 |  8 +++----
 create-repo                 |  8 +++----
 cron-jobs/ftpdir-cleanup    | 12 +++++-----
 cron-jobs/integrity-check   |  2 +-
 cron-jobs/repo-sanity-check |  4 ++--
 cron-jobs/sourceballs       | 12 +++++-----
 cron-jobs/sourceballs2      |  4 ++--
 db-check-nonfree            |  6 ++---
 db-cleanup                  |  4 ++--
 db-functions                | 58 ++++++++++++++++++++++-----------------------
 db-list-unsigned-packages   |  2 +-
 db-move                     | 10 ++++----
 db-remove                   | 10 ++++----
 db-repo-add                 |  8 +++----
 db-repo-remove              |  6 ++---
 db-sync                     |  8 +++----
 db-update                   | 20 ++++++++--------
 testing2x                   |  6 ++---
 18 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/any-to-ours b/any-to-ours
index c203a6e..d98cc5d 100755
--- a/any-to-ours
+++ b/any-to-ours
@@ -22,7 +22,7 @@ BASEARCH='x86_64'
 
 # Traverse all Arch repos
 for _repo in "${ARCHREPOS[@]}"; do
-	msg "Processing ${_repo}..."
+	msg "Processing %s..." "${_repo}"
 
 	# Find 'any' packages
 	# This is hardcoded but it could release other arches...
@@ -31,12 +31,12 @@ for _repo in "${ARCHREPOS[@]}"; do
 	             -printf "%f "))
 
 	if [ ${#PKGS[@]} -eq 0 ]; then
-		msg2 "No 'any' packages here"
+		msg2 "No '%s' packages here" any
 		continue
 	fi
 
 	for _arch in "${OURARCHES[@]}"; do
-		msg2 "Syncing ${_arch}..."
+		msg2 "Syncing %s..." "${_arch}"
 
 		# Sync 'any' only and extract the synced packages
 		SYNCED=($(
@@ -54,7 +54,7 @@ for _repo in "${ARCHREPOS[@]}"; do
 			continue
 		fi
 
-		msg2 "Synced ${#SYNCED[@]} packages: ${SYNCED[@]}"
+		msg2 "Synced %d packages: %s" "${#SYNCED[@]}" "${SYNCED[*]}"
 
 		msg2 "Adding to db..."
 
diff --git a/create-repo b/create-repo
index cfdbc23..b218832 100755
--- a/create-repo
+++ b/create-repo
@@ -5,20 +5,20 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -eq 0 ]; then
-	msg "Usage: ${0##*/} repo1 [repo2 ... repoX]"
+	msg "Usage: %s repo1 [repo2 ... repoX]" "${0##*/}"
 	exit 1
 fi
 
 msg "Creating repos..."
 for _repo in "$@"; do
-	msg2 "Creating [${_repo}]"
+	msg2 "Creating [%s]" "${_repo}"
 	mkdir -p "${FTP_BASE}/staging/${_repo}" || \
 		error "Failed creating staging dir"
 
 	for _arch in "${ARCHES[@]}"; do
 		mkdir -p "${FTP_BASE}/${_repo}/os/${_arch}" || \
-			error "Failed creating ${_arch} dir"
+			error "Failed creating %s dir" "${_arch}"
 	done
 done
 
-msg "Don't forget to add them to the PKGREPOS array on %s/config" "$(dirname "$(readlink -e "$0")")"
+msg "Don't forget to add them to the PKGREPOS array on %s" "$(dirname "$(readlink -e "$0")")/config"
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
 		}
 
diff --git a/db-check-nonfree b/db-check-nonfree
index cae4a14..c1673c3 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -ge 1 ]; then
-	warning "Calling ${0##*/} with a specific repository is not supported"
+	warning "Calling %s with a specific repository is not supported" "${0##*/}"
 	exit 1
 fi
 
@@ -19,7 +19,7 @@ msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 "${BLACKLIST_FILE}" | sort -u))
 for repo in "${ARCHREPOS[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
-		msg2 "$repo $pkgarch"
+		msg2 "%s %s" "$repo" "$pkgarch"
 		if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
@@ -33,7 +33,7 @@ for repo in "${ARCHREPOS[@]}"; do
 			fi
 		done
 		if [ ${#cleanpkgs[@]} -ge 1 ]; then
-			msg2 "Nonfree: ${cleanpkgs[*]}"
+			msg2 "Nonfree: %s" "${cleanpkgs[*]}"
 			arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}"
 		fi
 	done
diff --git a/db-cleanup b/db-cleanup
index b2f2e08..6ac9747 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -30,7 +30,7 @@ EXTRAFLAGS=()
 
 for _repo in "${PKGREPOS[@]}"; do
 	for _arch in "${ARCHES[@]}"; do
-		msg "Getting ${_repo}-${_arch} database"
+		msg "Getting %s-%s database" "${_repo}" "${_arch}"
 
 		dbfile="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}"
 
@@ -51,7 +51,7 @@ done
 msg "Removing old files:"
 
 for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}"; do
-	msg2 "${POOL}"
+	msg2 '%s' "${POOL}"
 
 	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
 		--include-from="/tmp/${0##*/}.$$.filter" \
diff --git a/db-functions b/db-functions
index 1384080..51fc1bd 100644
--- a/db-functions
+++ b/db-functions
@@ -97,7 +97,7 @@ script_lock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 		local _owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
-		error "Script ${0##*/} is already locked by $_owner."
+		error "Script %s is already locked by %s." "${0##*/}" "$_owner"
 		exit 1
 	else
 		set_umask
@@ -108,7 +108,7 @@ script_lock() {
 script_unlock() {
 	local LOCKDIR="$TMPDIR/.scriptlock.${0##*/}"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Script ${0##*/} was not locked!"
+		warning "Script %s was not locked!" "${0##*/}"
 		restore_umask
 		return 1
 	else
@@ -128,12 +128,12 @@ cleanup() {
 		repo=${l%.*}
 		arch=${l#*.}
 		if [ -d "$TMPDIR/.repolock.$repo.$arch" ]; then
-			msg "Removing left over lock from [${repo}] (${arch})"
+			msg "Removing left over lock from [%s] (%s)" "${repo}" "${arch}"
 			repo_unlock "$repo" "$arch"
 		fi
 	done
 	if [ -d "$TMPDIR/.scriptlock.${0##*/}" ]; then
-		msg "Removing left over lock from ${0##*/}"
+		msg "Removing left over lock from %s" "${0##*/}"
 		script_unlock
 	fi
 	rm -rf "$WORKDIR"
@@ -146,7 +146,7 @@ abort() {
 }
 
 die() {
-	error "$*"
+	error "$@"
 	cleanup 1
 }
 
@@ -167,11 +167,11 @@ repo_lock () {
 
 	# This is the lock file used by repo-add and repo-remove
 	if [ -f "${DBLOCKFILE}" ]; then
-		error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat "$DBLOCKFILE")"
+		error "Repo [%s] (%s) is already locked by repo-{add,remove} process %s" "$1" "$2" "$(<"$DBLOCKFILE")"
 		return 1
 	fi
 	if [ -f "${FILESLOCKFILE}" ]; then
-		error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat "$FILESLOCKFILE")"
+		error "Repo [%s] (%s) is already locked by repo-{add,remove} process %s" "$2" "$2" "$(<"$FILESLOCKFILE")"
 		return 1
 	fi
 
@@ -188,8 +188,8 @@ repo_lock () {
 	while [ "$_count" -le "$_trial" ] || "$_lockblock" ; do
 		if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
 			_owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
-			warning "Repo [${1}] (${2}) is already locked by $_owner. "
-			msg2 "Retrying in $LOCK_DELAY seconds..."
+			warning "Repo [%s] (%s) is already locked by %s." "$1" "$2" "$_owner"
+			msg2 "Retrying in %d seconds..." "$LOCK_DELAY"
 		else
 			LOCKS+=("$1.$2")
 			set_umask
@@ -199,14 +199,14 @@ repo_lock () {
 		let _count=$_count+1
 	done
 
-	error "Repo [${1}] (${2}) is already locked by $_owner. Giving up!"
+	error "Repo [%s] (%s) is already locked by %s. Giving up!" "${1}" "${2}" "$_owner"
 	return 1
 }
 
 repo_unlock () { #repo_unlock <repo-name> <arch>
 	local LOCKDIR="$TMPDIR/.repolock.$1.$2"
 	if [ ! -d "$LOCKDIR" ]; then
-		warning "Repo lock [${1}] (${2}) was not locked!"
+		warning "Repo lock [%s] (%s) was not locked!" "${1}" "${2}"
 		restore_umask
 		return 1
 	else
@@ -254,7 +254,7 @@ getpkgname() {
 
 	_name="$(_grep_pkginfo "$1" "pkgname")"
 	if [ -z "$_name" ]; then
-		error "Package '$1' has no pkgname in the PKGINFO. Fail!"
+		error "Package '%s' has no pkgname in the PKGINFO. Fail!" "$1"
 		exit 1
 	fi
 
@@ -267,7 +267,7 @@ getpkgver() {
 
 	_ver="$(_grep_pkginfo "$1" "pkgver")"
 	if [ -z "$_ver" ]; then
-		error "Package '$1' has no pkgver in the PKGINFO. Fail!"
+		error "Package '%s' has no pkgver in the PKGINFO. Fail!" "$1"
 		exit 1
 	fi
 
@@ -279,7 +279,7 @@ getpkgarch() {
 
 	_ver="$(_grep_pkginfo "$1" "arch")"
 	if [ -z "$_ver" ]; then
-		error "Package '$1' has no arch in the PKGINFO. Fail!"
+		error "Package '%s' has no arch in the PKGINFO. Fail!" "$1"
 		exit 1
 	fi
 
@@ -291,10 +291,10 @@ getpkgfile() {
 		error 'No canonical package found!'
 		exit 1
 	elif [ ! -f "${1}" ]; then
-		error "Package ${1} not found!"
+		error "Package %s not found!" "${1}"
 		exit 1
 	elif "${REQUIRE_SIGNATURE}" && [ ! -f "${1}.sig" ]; then
-		error "Package signature ${1}.sig not found!"
+		error "Package signature %s not found!" "${1}.sig"
 		exit 1
 	fi
 
@@ -310,10 +310,10 @@ getpkgfiles() {
 
 	for f in "${@}"; do
 		if  [ ! -f "${f}" ]; then
-			error "Package ${f} not found!"
+			error "Package %s not found!" "${f}"
 			exit 1
 		elif "${REQUIRE_SIGNATURE}" && [ ! -f "${f}.sig" ]; then
-			error "Package signature ${f}.sig not found!"
+			error "Package signature %s not found!" "${f}.sig"
 			exit 1
 		fi
 	done
@@ -384,7 +384,7 @@ check_splitpkgs() {
 	for pkgfile in "${pkgfiles[@]}"; do
 		issplitpkg "${pkgfile}" || continue
 		local _pkgbase="$(getpkgbase "${pkgfile}")"
-		msg2 "Checking $_pkgbase"
+		msg2 "Checking %s" "$_pkgbase"
 		local _pkgname="$(getpkgname "${pkgfile}")"
 		local _pkgarch="$(getpkgarch "${pkgfile}")"
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
@@ -490,12 +490,12 @@ set_repo_permission() {
 
 	if [ -w "${dbfile}" ]; then
 		local group=$(/usr/bin/stat --printf='%G' "$(dirname "${dbfile}")")
-		chgrp "$group" "${dbfile}"    || error "Could not change group of ${dbfile} to $group"
-		chgrp "$group" "${filesfile}" || error "Could not change group of ${filesfile} to $group"
-		chmod g+w "${dbfile}"    || error "Could not set write permission for group $group to ${dbfile}"
-		chmod g+w "${filesfile}" || error "Could not set write permission for group $group to ${filesfile}"
+		chgrp "$group" "${dbfile}"    || error "Could not change group of %s to %s" "${dbfile}" "$group"
+		chgrp "$group" "${filesfile}" || error "Could not change group of %s to %s" "${filesfile}" "$group"
+		chmod g+w "${dbfile}"    || error "Could not set write permission for group %s to %s" "$group" "${dbfile}"
+		chmod g+w "${filesfile}" || error "Could not set write permission for group %s to %s" "$group" "${filesfile}"
 	else
-		error "You don't have permission to change ${dbfile}"
+		error "You don't have permission to change %s" "${dbfile}"
 	fi
 }
 
@@ -507,9 +507,9 @@ arch_repo_add() {
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
 	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" >/dev/null \
-		|| error "repo-add ${repo}${DBEXT} ${pkgs[*]}"
+		|| error '%s' "repo-add ${repo}${DBEXT} ${pkgs[*]}"
 	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" "${pkgs[@]}" \
-		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
+		|| error '%s' "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
 }
@@ -522,12 +522,12 @@ arch_repo_remove() {
 	local filesfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${FILESEXT}"
 
 	if [ ! -f "${dbfile}" ]; then
-		error "No database found at '${dbfile}'"
+		error "No database found at '%s'" "${dbfile}"
 		return 1
 	fi
 	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" >/dev/null \
-		|| error "repo-remove ${dbfile} ${pkgs[*]}"
+		|| error '%s' "repo-remove ${dbfile} ${pkgs[*]}"
 	/usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \
-		|| error "repo-remove ${filesfile} ${pkgs[*]}"
+		|| error '%s' "repo-remove ${filesfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
 }
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index c88203b..095e1e6 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -24,7 +24,7 @@ set -e
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 1 ]; then
-	msg "usage: ${0##*/} <architecture>"
+	msg "usage: %s <architecture>" "${0##*/}"
 	exit 1
 fi
 
diff --git a/db-move b/db-move
index 53543bc..b057d28 100755
--- a/db-move
+++ b/db-move
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo-from> <repo-to> <pkgname|pkgbase> ..."
+	msg "usage: %s <repo-from> <repo-to> <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -15,7 +15,7 @@ ftppath_from="${FTP_BASE}/${repo_from}/os/"
 ftppath_to="${FTP_BASE}/${repo_to}/os/"
 
 if ! check_repo_permission "$repo_to" || ! check_repo_permission "$repo_from"; then
-	die "You don't have permission to move packages from ${repo_from} to ${repo_to}"
+	die "You don't have permission to move packages from %s to %s" "${repo_from}" "${repo_to}"
 fi
 
 # TODO: this might lock too much (architectures)
@@ -53,10 +53,10 @@ for pkgbase in "${args[@]:2}"; do
 			continue 2
 		fi
 	done
-	die "${pkgbase} not found in ${repo_from}"
+	die "%s not found in %s" "${pkgbase}" "${repo_from}"
 done
 
-msg "Moving packages from [${repo_from}] to [${repo_to}]..."
+msg "Moving packages from [%s] to [%s]..." "${repo_from}" "${repo_to}"
 
 declare -A add_pkgs
 declare -A remove_pkgs
@@ -70,7 +70,7 @@ for pkgbase in "${args[@]:2}"; do
 			else
 				tarches=("${pkgarch}")
 			fi
-			msg2 "${pkgbase} (${tarches[*]})"
+			msg2 '%s (%s)' "${pkgbase}" "${tarches[*]}"
 			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
 			pkgver=$(. "${svnrepo_from}/PKGBUILD"; get_full_version "${epoch:-0}" "${pkgver}" "${pkgrel}")
 
diff --git a/db-remove b/db-remove
index b0ed9bd..8fff9db 100755
--- a/db-remove
+++ b/db-remove
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgname|pkgbase> ..."
+	msg "usage: %s <repo> <arch> <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -13,7 +13,7 @@ arch="$2"
 pkgbases=("${@:3}")
 
 if ! check_repo_permission "$repo"; then
-	die "You don't have permission to remove packages from ${repo}"
+	die "You don't have permission to remove packages from %s" "${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
@@ -28,13 +28,13 @@ done
 
 remove_pkgs=()
 for pkgbase in "${pkgbases[@]}"; do
-	msg "Removing $pkgbase from [$repo]..."
+	msg "Removing %s from [%s]..." "$pkgbase" "$repo"
 
 	if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
 		remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
 	else
-		warning "$pkgbase not found in ABS(libre)"
-		warning "Removing only $pkgbase from the repo"
+		warning "%s not found in ABS(libre)" "$pkgbase"
+		warning "Removing only %s from the repo" "$pkgbase"
 		warning "If it was a split package you have to remove the others yourself!"
 		remove_pkgs+=("$pkgbase")
 	fi
diff --git a/db-repo-add b/db-repo-add
index 92be22e..4611bdf 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgfile> ..."
+	msg "usage: %s <repo> <arch> <pkgfile> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -15,7 +15,7 @@ pkgfiles=("${@:3}")
 ftppath="$FTP_BASE/$repo/os"
 
 if ! check_repo_permission "$repo"; then
-	die "You don't have permission to add packages to ${repo}"
+	die "You don't have permission to add packages to %s" "${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
@@ -31,9 +31,9 @@ done
 for tarch in "${tarches[@]}"; do
 	for pkgfile in "${pkgfiles[@]}"; do
 		if [[ ! -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ]]; then
-			die "Package file ${pkgfile##*/} not found in ${FTP_BASE}/${repo}/os/${arch}/"
+			die "Package file %s not found in %s" "${pkgfile##*/}" "${FTP_BASE}/${repo}/os/${arch}/"
 		else
-			msg "Adding $pkgfile to [$repo]..."
+			msg "Adding %s to [%s]..." "$pkgfile" "$repo"
 		fi
 	done
 	arch_repo_add "${repo}" "${tarch}" "${pkgfiles[@]}"
diff --git a/db-repo-remove b/db-repo-remove
index 487abd8..aadc4ce 100755
--- a/db-repo-remove
+++ b/db-repo-remove
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 3 ]; then
-	msg "usage: ${0##*/} <repo> <arch> <pkgname> ..."
+	msg "usage: %s <repo> <arch> <pkgname> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -15,7 +15,7 @@ pkgnames=("${@:3}")
 ftppath="$FTP_BASE/$repo/os"
 
 if ! check_repo_permission "$repo"; then
-	die "You don't have permission to remove packages from ${repo}"
+	die "You don't have permission to remove packages from %s" "${repo}"
 fi
 
 if [ "$arch" == "any" ]; then
@@ -30,7 +30,7 @@ done
 
 for tarch in "${tarches[@]}"; do
 	for pkgname in "${pkgnames[@]}"; do
-		msg "Removing $pkgname from [$repo]..."
+		msg "Removing %s from [%s]..." "$pkgname" "$repo"
 	done
 	arch_repo_remove "${repo}" "${tarch}" "${pkgnames[@]}"
 	repo_unlock "$repo" "$tarch"
diff --git a/db-sync b/db-sync
index 9b90219..58e211d 100755
--- a/db-sync
+++ b/db-sync
@@ -71,7 +71,7 @@ init() {
 	# Traverse all repo-arch pairs
 	for _repo in "${ARCHREPOS[@]}"; do
 		for _arch in "${ARCHARCHES[@]}"; do
-			msg "Processing ${_repo}-${_arch}"
+			msg "Processing %s-%s" "${_repo}-${_arch}"
 
 			db_file=$(get_repo_file "${_repo}" "${_arch}")${DBEXT}
 			files_file=$(get_repo_file "${_repo}" "${_arch}")${FILESEXT}
@@ -106,7 +106,7 @@ init() {
 			# pass through
 			printf '%s\n' "${db[@]}" | sed "s|.$|&*|g" > "/tmp/${_repo}-${_arch}.whitelist"
 
-			msg2 "$(wc -l /tmp/${_repo}-${_arch}.whitelist | cut -d' ' -f1) packages in whitelist"
+			msg2 "%d packages in whitelist" "$(wc -l /tmp/${_repo}-${_arch}.whitelist | cut -d' ' -f1)"
 
 			# Sync excluding everything but whitelist
 			# We delete here for cleanup
@@ -139,7 +139,7 @@ init() {
 	# Concatenate all whitelists, check for single *s just in case
 	cat "${whitelists[@]}" | grep -v "^\*$" | sort -u > /tmp/any.whitelist
 
-	msg2 "Retrieving $(wc -l /tmp/any.whitelist | cut -d' ' -f1) packages from pool"
+	msg2 "Retrieving %d packages from pool" "$(wc -l /tmp/any.whitelist | cut -d' ' -f1)"
 
 	# Sync
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
@@ -192,7 +192,7 @@ source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # Check variables presence
 for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
-	test -z "${!var}" && fatal_error "Empty ${var}"
+	test -z "${!var}" && fatal_error "Empty %s" "${var}"
 done
 
 # From makepkg
diff --git a/db-update b/db-update
index 18162db..ced673e 100755
--- a/db-update
+++ b/db-update
@@ -6,14 +6,14 @@
 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
 repos=($(find  "${STAGING}" -mindepth 1 -maxdepth 1 -type d ! -empty -printf '%f ' 2>/dev/null))
 if [ $? -ge 1 ]; then
-	die "Could not read ${STAGING}"
+	die "Could not read %s" "${STAGING}"
 fi
 
 # TODO: this might lock too much (architectures)
@@ -28,37 +28,37 @@ 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 ! 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
 		# This is fucking obnoxious
 		#if ! check_splitpkgs ${repo} "${pkgs[@]}"; then
-		#	die "Missing split packages for ${repo}"
+		#	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))
 		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}"
diff --git a/testing2x b/testing2x
index 37c4395..0c5c8d7 100755
--- a/testing2x
+++ b/testing2x
@@ -4,7 +4,7 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -lt 1 ]; then
-	msg "usage: ${0##*/} <pkgname|pkgbase> ..."
+	msg "usage: %s <pkgname|pkgbase> ..." "${0##*/}"
 	exit 1
 fi
 
@@ -30,7 +30,7 @@ for pkgbase in "$@"; do
 				break
 			fi
 		done
-		"${found_source}" || die "${pkgbase} not found in [testing]"
+		"${found_source}" || die "%s not found in [testing]" "${pkgbase}"
 		found_target=false
 		for pkgarch in "${ARCHES[@]}" 'any'; do
 			for repo in 'core' 'extra'; do
@@ -42,7 +42,7 @@ for pkgbase in "$@"; do
 				fi
 			done
 		done
-		"${found_target}" || die "${pkgbase} neither found in [core] nor [extra]"
+		"${found_target}" || die "%s neither found in [core] nor [extra]" "${pkgbase}"
 	fi
 done
 
-- 
cgit v1.2.3