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 | |
| 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
| -rw-r--r-- | abuild.in | 2 | ||||
| -rw-r--r-- | buildlab.in | 12 | ||||
| -rw-r--r-- | checkapk.in | 5 |
3 files changed, 10 insertions, 9 deletions
@@ -2166,7 +2166,7 @@ rootbld() { fi [ "$CBUILD" = "$CHOST" ] || die "rootbld: cross-building not supported currently" - apk info -eq abuild-rootbld || die "rootbld: abuild-rootbld package not installed" + $APK info -eq abuild-rootbld || die "rootbld: abuild-rootbld package not installed" logcmd "chroot building building $repo/$pkgname-$pkgver-r$pkgrel" diff --git a/buildlab.in b/buildlab.in index e8d3d09..1b56ffc 100644 --- a/buildlab.in +++ b/buildlab.in @@ -106,8 +106,8 @@ do_chroot_action() { update_chroot() { local path="$1" - apk --root $path --repositories "$path"/etc/apk/repositories update - apk --root $path --repositories "$path"/etc/apk/repositories upgrade -a + $APK --root $path --repositories "$path"/etc/apk/repositories update + $APK --root $path --repositories "$path"/etc/apk/repositories upgrade -a } prepare_chroot() { @@ -139,19 +139,19 @@ prepare_chroot() { msg "Updating package lists..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories update + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories update msg "Installing alpine-base..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb alpine-base + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb alpine-base msg "Installing abuild..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb abuild + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb abuild msg "Installing build-base..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb build-base + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb build-base msg "Adding abuild user..." 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'?" |