Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archbuild.in
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2013-08-16 02:18:29 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2017-02-16 14:42:38 -0500
commitf302cbed525fddc4596c6d568a176a1528b88058 (patch)
treeef183433e932c484b38d2286ad7bc5ebe7362d4c /archbuild.in
parent978caaf7de4b7e18d5b9a3763d479ab5a7adae24 (diff)
Avoid using string interpolation; use printf format strings instead.
This involves extending the signature of lib/common.sh's `stat_busy()`, `lock()`, and `slock()`. The `mesg=$1; shift` in stat_busy even suggests that this is what was originally intended from it.
Diffstat (limited to 'archbuild.in')
-rw-r--r--archbuild.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/archbuild.in b/archbuild.in
index c1917c3..812db7c 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -45,13 +45,13 @@ check_root "$0" "${orig_argv[@]}"
makechrootpkg_args+=("${@:$OPTIND}")
if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
- msg "Creating chroot for [${repo}] (${arch})..."
+ msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"
for copy in "${chroots}/${repo}-${arch}"/*; do
[[ -d $copy ]] || continue
- msg2 "Deleting chroot copy '$(basename "${copy}")'..."
+ msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
- lock 9 "$copy.lock" "Locking chroot copy '$copy'"
+ lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then
{ type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
@@ -76,5 +76,5 @@ else
pacman -Syu --noconfirm || abort
fi
-msg "Building in chroot for [${repo}] (${arch})..."
+msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
exec makechrootpkg -r "${chroots}/${repo}-${arch}" "${makechrootpkg_args[@]}"