summaryrefslogtreecommitdiff
path: root/rebuildpkgs.in
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-08-16 02:20:09 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-08-16 02:20:09 -0400
commit3aca3b64077cfdb5132c08958c5e0e873aca89d2 (patch)
treed4ae2e90b5b0bf54b9fb0ae946cfa163f545660c /rebuildpkgs.in
parent9862c71c160631bfc1a14ccbd42688c547ca9c0b (diff)
Avoid having code/variables in format strings.
Diffstat (limited to 'rebuildpkgs.in')
-rw-r--r--rebuildpkgs.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/rebuildpkgs.in b/rebuildpkgs.in
index 2f71c40..65be0de 100644
--- a/rebuildpkgs.in
+++ b/rebuildpkgs.in
@@ -49,7 +49,7 @@ pkgs="$@"
SVNPATH='svn+ssh://nymeria.archlinux.org/srv/repos/svn-packages/svn'
-msg "Work will be done in $(pwd)/rebuilds"
+msg "Work will be done in %s/rebuilds" "$(pwd)"
REBUILD_ROOT="$(pwd)/rebuilds"
mkdir -p "$REBUILD_ROOT"
@@ -61,11 +61,11 @@ FAILED=""
for pkg in $pkgs; do
cd "$REBUILD_ROOT/svn-packages"
- msg2 "Building '$pkg'"
+ msg2 "Building '%s'" "$pkg"
/usr/bin/svn update "$pkg"
if [[ ! -d "$pkg/trunk" ]]; then
FAILED="$FAILED $pkg"
- warning "$pkg does not exist in SVN"
+ warning "%s does not exist in SVN" "$pkg"
continue
fi
cd "$pkg/trunk/"
@@ -74,14 +74,14 @@ for pkg in $pkgs; do
if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
FAILED="$FAILED $pkg"
- error "$pkg Failed!"
+ error "%s Failed!" "$pkg"
else
pkgfile=$(pkg_from_pkgbuild)
if [[ -e $pkgfile ]]; then
- msg2 "$pkg Complete"
+ msg2 "%s Complete" "$pkg"
else
FAILED="$FAILED $pkg"
- error "$pkg Failed, no package built!"
+ error "%s Failed, no package built!" "$pkg"
fi
fi
done
@@ -90,7 +90,7 @@ cd "$REBUILD_ROOT"
if [[ -n $FAILED ]]; then
msg 'Packages failed:'
for pkg in $FAILED; do
- msg2 "$pkg"
+ msg2 "%s" "$pkg"
done
fi