diff options
author | Luke Shumaker <lukeshu@parabola.nu> | 2013-08-16 02:18:29 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@parabola.nu> | 2017-02-16 14:42:38 -0500 |
commit | f302cbed525fddc4596c6d568a176a1528b88058 (patch) | |
tree | ef183433e932c484b38d2286ad7bc5ebe7362d4c /crossrepomove.in | |
parent | 978caaf7de4b7e18d5b9a3763d479ab5a7adae24 (diff) | |
download | devtools32-f302cbed525fddc4596c6d568a176a1528b88058.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 'crossrepomove.in')
-rw-r--r-- | crossrepomove.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crossrepomove.in b/crossrepomove.in index d0964e3..afeec77 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -39,13 +39,13 @@ setup_workdir pushd $WORKDIR >/dev/null -msg "Downloading sources for ${pkgbase}" +msg "Downloading sources for %s" "${pkgbase}" svn -q checkout -N "${target_svn}" target_checkout mkdir -p "target_checkout/${pkgbase}/repos" svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die . "target_checkout/${pkgbase}/trunk/PKGBUILD" -msg "Downloading packages for ${pkgbase}" +msg "Downloading packages for %s" "${pkgbase}" for _arch in ${arch[@]}; do if [[ "${_arch[*]}" == 'any' ]]; then repo_arch='x86_64' @@ -59,7 +59,7 @@ for _arch in ${arch[@]}; do done done -msg "Adding ${pkgbase} to ${target_repo}" +msg "Adding %s to %s" "${pkgbase}" "${target_repo}" svn -q add "target_checkout/${pkgbase}" svn -q propset svn:keywords 'Id' "target_checkout/${pkgbase}/trunk/PKGBUILD" svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" target_checkout @@ -69,7 +69,7 @@ popd >/dev/null ssh "${server}" "${target_dbscripts}/db-update" || die -msg "Removing ${pkgbase} from ${source_repo}" +msg "Removing %s from %s" "${pkgbase}" "${source_repo}" for _arch in ${arch[@]}; do ssh "${server}" "${source_dbscripts}/db-remove ${source_repo} ${_arch} ${pkgbase}" done |