summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-04-26 21:05:40 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2013-04-26 19:11:38 +0000
commit67e769e605a09338b1234b2a9503305ebd632832 (patch)
treeb8575a8f4a4f11de3ed1a65a82b020e1c5e2ec85
parenta1b0ccbba2c1c1b4cc59cb5f8290e6477b16aa5c (diff)
downloadabuild-67e769e605a09338b1234b2a9503305ebd632832.tar.gz
abuild-67e769e605a09338b1234b2a9503305ebd632832.tar.bz2
abuild-67e769e605a09338b1234b2a9503305ebd632832.tar.xz
abuild-67e769e605a09338b1234b2a9503305ebd632832.zip
buildrepo: avoid using 'i' as loop variable
some apkbuilds use it in global context
-rwxr-xr-xbuildrepo.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/buildrepo.in b/buildrepo.in
index 7707049..a37ab8d 100755
--- a/buildrepo.in
+++ b/buildrepo.in
@@ -20,7 +20,7 @@ fi
usage() {
echo "usage: $program [-a APORTSDIR] [-d REPODIR] [-hp] [-l LOGPREFIX ]"
echo " [-r DEPREPO] REPOSITORY..."
-
+
echo "options:"
echo " -a Set the aports base dir to APORTSDIR instead of $aportsdir"
echo " -d Set destination repository base dir to REPODIR instead of $repodir"
@@ -87,10 +87,10 @@ list_needbuild() {
# first we try copy everything possible and find out which we need
# to rebuild. By doing this we might save us for rebuilding
# needed when running 'abuild -R'
- for i in */APKBUILD; do
- [ -f "$aportsdir/$repo/$i" ] || continue
+ for apkbuild in */APKBUILD; do
+ [ -f "$aportsdir/$repo/$apkbuild" ] || continue
export REPODEST="$repodir"
- cd "$aportsdir/$repo"/${i%/*} || return 1
+ cd "$aportsdir/$repo"/${apkbuild%/*} || return 1
pkgname=
pkgver=
pkgrel=
@@ -118,9 +118,9 @@ list_needbuild() {
echo ">>> Copying " $pkgs >&2
cp -p -l $pkgs "$repodir/$repo/$CARCH"/ 2>/dev/null \
|| cp -p $pkgs "$repodir/$repo/$CARCH"/ \
- || echo "$i"
+ || echo "$apkbuild"
else
- echo "$i"
+ echo "$apkbuild"
fi
done
}