summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-06-01 22:24:05 -0500
committerMax Rees <maxcrees@me.com>2020-06-01 22:24:05 -0500
commite91c1ca5f5498ca0383163a7ce5fe7899399aaac (patch)
tree285742f731521fe6fe7aeb52727486cfe72eeed7
parentf4e30e198e61111e76658b2bd8aeccc75ccd7deb (diff)
downloadabuild-e91c1ca5f5498ca0383163a7ce5fe7899399aaac.tar.gz
abuild-e91c1ca5f5498ca0383163a7ce5fe7899399aaac.tar.bz2
abuild-e91c1ca5f5498ca0383163a7ce5fe7899399aaac.tar.xz
abuild-e91c1ca5f5498ca0383163a7ce5fe7899399aaac.zip
checkapk: use APK_FETCH for apk
-rw-r--r--checkapk.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/checkapk.in b/checkapk.in
index da2fde3..01773c9 100644
--- a/checkapk.in
+++ b/checkapk.in
@@ -15,7 +15,7 @@ if ! [ -f "$datadir/functions.sh" ]; then
fi
. "$datadir/functions.sh"
-: ${APK:="apk"}
+: ${APK_FETCH:="apk"}
usage() {
cat >&2 <<-__EOF__
@@ -68,12 +68,12 @@ for i in $pkgname $subpackages; do
# generate a temp repositories file with only the http(s) repos
grep -E "^https?:" /etc/apk/repositories > $tmpdir/repositories
- oldpkg=$($APK fetch --repositories-file $tmpdir/repositories --simulate 2>&1 | sed 's/^Downloading //')
+ oldpkg=$($APK_FETCH fetch --repositories-file $tmpdir/repositories --simulate 2>&1 | sed 's/^Downloading //')
if [ "${oldpkg}" = "${pkg}" ]; then
die "the built package ($_pkgname) is already in the repo"
fi
- $APK fetch --quiet --repositories-file $tmpdir/repositories --stdout $_pkgname \
+ $APK_FETCH fetch --quiet --repositories-file $tmpdir/repositories --stdout $_pkgname \
| tar -ztf - | grep -v '^\.SIGN\.' | sort > filelist-$_pkgname-old \
|| die "failed to download old pkg, maybe run 'apk update'?"