summaryrefslogtreecommitdiff
path: root/db-update
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-update
parent7850874b1ef1b18de585be108e3be899d95a3a2a (diff)
Use printf-formatters instead of string interpolation on msg, error, etc.
Diffstat (limited to 'db-update')
-rwxr-xr-xdb-update24
1 files changed, 12 insertions, 12 deletions
diff --git a/db-update b/db-update
index 0544e7c..9a57b19 100755
--- a/db-update
+++ b/db-update
@@ -4,14 +4,14 @@
. "$(dirname "$0")/db-functions"
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=()
@@ -31,25 +31,25 @@ done
# check if packages are valid
for repo in "${repos[@]}"; do
if ! 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
pkgs=($(getpkgfiles "${STAGING}/${repo}/"*${PKGEXT}))
if [ $? -eq 0 ]; then
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"
+ die "Package %s does not have a valid signature" "${repo}/${pkg##*/}"
fi
if ! check_pkgsvn "${pkg}" "${repo}"; then
- die "Package ${repo}/${pkg##*/} is not consistent with svn repository"
+ die "Package %s is not consistent with svn repository" "${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
if ! check_packager "${pkg}"; then
die "Package ${repo}/${pkg##*/} does not have a valid packager"
@@ -62,22 +62,22 @@ for repo in "${repos[@]}"; do
fi
done
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}"