diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-05 02:00:00 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-05 02:00:00 -0400 |
| commit | 33f227ec628f30b70ee5b1412fd47564325b4b4c (patch) | |
| tree | f42794a93d0ba8f59f6de86e76e49fc174259090 | |
| parent | d732aae2ca57430f3dd95c0ed4dcc05df4014f91 (diff) | |
| download | devtools32-33f227ec628f30b70ee5b1412fd47564325b4b4c.tar.xz | |
commitpkg: Use printf-formatterslibretools-testing-20140726libretools-20141001
Also, the quoting on one line confused xgettext.
| -rw-r--r-- | commitpkg.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/commitpkg.in b/commitpkg.in index 1095006..65876a3 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -47,7 +47,7 @@ done for i in 'changelog' 'install'; do while read -r file; do # evaluate any bash variables used - eval file=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$file")\" + eval file=\"$(sed "s/^\(['\"]\)\(.*\)\1\$/\2/" <<< "$file")\" needsversioning+=("$file") done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) done @@ -135,7 +135,7 @@ for _arch in ${arch[@]}; do fullver=$(get_full_version $_pkgname) if ! pkgfile=$(find_cached_package "$_pkgname" "$fullver" "${_arch}"); then - warning "Skipping $_pkgname-$fullver-$_arch: failed to locate package file" + warning "Skipping %s: failed to locate package file" "$_pkgname-$fullver-$_arch" skip_arches+=($_arch) continue 2 fi @@ -143,7 +143,7 @@ for _arch in ${arch[@]}; do sigfile="${pkgfile}.sig" if [[ ! -f $sigfile ]]; then - msg "Signing package ${pkgfile}..." + msg "Signing package %s..." "${pkgfile}" if [[ -n $GPGKEY ]]; then SIGNWITHKEY="-u ${GPGKEY}" fi @@ -183,7 +183,7 @@ fi if [[ "${arch[*]}" == 'any' ]]; then if [[ -d ../repos/$repo-i686 && -d ../repos/$repo-x86_64 ]]; then pushd ../repos/ >/dev/null - stat_busy "Removing $repo-i686 and $repo-x86_64" + stat_busy "Removing %s and %s" "$repo-i686" "$repo-x86_64" svn rm -q $repo-i686 svn rm -q $repo-x86_64 svn commit -q -m "Removed $repo-i686 and $repo-x86_64 for $pkgname" @@ -193,7 +193,7 @@ if [[ "${arch[*]}" == 'any' ]]; then else if [[ -d ../repos/$repo-any ]]; then pushd ../repos/ >/dev/null - stat_busy "Removing $repo-any" + stat_busy "Removing %s" "$repo-any" svn rm -q $repo-any svn commit -q -m "Removed $repo-any for $pkgname" stat_done |