diff options
author | Max Rees <maxcrees@me.com> | 2019-06-04 00:07:15 -0400 |
---|---|---|
committer | Max Rees <maxcrees@me.com> | 2020-03-07 17:34:09 -0600 |
commit | 5a162fad5719f7d935e76d6f8ac68b7938a9e527 (patch) | |
tree | cf2f962642e785abb398819131dfbf1b60fa1440 /checkapk.in | |
parent | 9efd4a78db21b6eadbf212c8072622d2df765062 (diff) | |
download | abuild-5a162fad5719f7d935e76d6f8ac68b7938a9e527.tar.gz abuild-5a162fad5719f7d935e76d6f8ac68b7938a9e527.tar.bz2 abuild-5a162fad5719f7d935e76d6f8ac68b7938a9e527.tar.xz abuild-5a162fad5719f7d935e76d6f8ac68b7938a9e527.zip |
abuild, buildlab, checkapk: use $APK for apk
Diffstat (limited to 'checkapk.in')
-rw-r--r-- | checkapk.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/checkapk.in b/checkapk.in index 4f9b27a..da2fde3 100644 --- a/checkapk.in +++ b/checkapk.in @@ -15,6 +15,7 @@ if ! [ -f "$datadir/functions.sh" ]; then fi . "$datadir/functions.sh" +: ${APK:="apk"} usage() { cat >&2 <<-__EOF__ @@ -67,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 --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 --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'?" |