summaryrefslogtreecommitdiff
path: root/db-move
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-06-18 20:33:06 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-04-16 13:51:18 -0400
commit6638878c5eb6d5116580d06cc3042a5e9beacb7e (patch)
tree92476d6e2ec6fada6b6e3bedb1cfcffcc7988065 /db-move
parent7850874b1ef1b18de585be108e3be899d95a3a2a (diff)
Use printf-formatters instead of string interpolation on msg, error, etc.
Diffstat (limited to 'db-move')
-rwxr-xr-xdb-move10
1 files changed, 5 insertions, 5 deletions
diff --git a/db-move b/db-move
index 4828e75..cd67953 100755
--- a/db-move
+++ b/db-move
@@ -4,7 +4,7 @@
. "$(dirname "$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)
@@ -55,10 +55,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
@@ -74,7 +74,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}")