diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-04-02 04:09:55 -0400 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-04-05 22:11:16 +0200 |
| commit | cb35d74f8ce0e1ad489c59d608877e4d6b34ca85 (patch) | |
| tree | 1e03536795be58879ae0af8964b55545c51b184b /archbuild.in | |
| parent | 14d5e1c21b69975a8d30aba059e1012595d48bba (diff) | |
| download | devtools32-cb35d74f8ce0e1ad489c59d608877e4d6b34ca85.tar.xz | |
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.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archbuild.in b/archbuild.in index bb2577d..8339aef 100644 --- a/archbuild.in +++ b/archbuild.in @@ -45,13 +45,13 @@ check_root 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" subvolume_delete_recursive "${copy}" rm -rf --one-file-system "${copy}" @@ -74,5 +74,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[@]}" |