diff options
Diffstat (limited to 'abuild.in')
| -rwxr-xr-x | abuild.in | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -10,7 +10,7 @@ abuild_ver=@VERSION@ sysconfdir=@sysconfdir@ -abuildrepo=@apkcache@ +apkcache=@apkcache@ startdir="$PWD" srcdir=${srcdir:-"$startdir/src"} @@ -26,7 +26,7 @@ BUILD_BASE="build-base" SUDO=${SUDO:-"sudo"} -default_cmds="sanitycheck builddeps clean fetch unpack rootpkg abuildrepo" +default_cmds="sanitycheck builddeps clean fetch unpack rootpkg apkcache" # read config ABUILD_CONF=${ABUILD_CONF:-"$sysconfdir/abuild.conf"} @@ -234,7 +234,7 @@ cleanpkg() { for i in $pkgname $subpackages; do local p="${i%:*}-$pkgver-r$pkgrel" rm -f "$PKGDEST/$p.apk" "$PKGDEST/$p.src.tar.gz" \ - "$abuildrepo"/$p.apk + "$apkcache"/$p.apk done # remove given packages from index @@ -398,8 +398,8 @@ create_apks() { done } -update_abuildrepo_index() { - local index="$abuildrepo"/APK_INDEX.gz +update_apkcache_index() { + local index="$apkcache"/APK_INDEX.gz local opt= ( for i in "$@"; do @@ -410,24 +410,24 @@ update_abuildrepo_index() { apk index -q -d "$index" $todelete || exit 1 fi apk index -q "$@" || exit 1 - ) > "$abuildrepo"/APK_INDEX.new || return 1 - gzip "$abuildrepo"/APK_INDEX.new && mv "$abuildrepo/APK_INDEX.new.gz" "$index" + ) > "$apkcache"/APK_INDEX.new || return 1 + gzip "$apkcache"/APK_INDEX.new && mv "$apkcache/APK_INDEX.new.gz" "$index" } -abuildrepo() { +apkcache() { if ! up2date; then sanitycheck && builddeps && clean && fetch && unpack && rootpkg || return 1 fi local apk set -- for apk in $(listpkg); do - ln -sf "$PKGDEST"/$apk "$abuildrepo"/$apk - set -- "$@" "$abuildrepo"/$apk + ln -sf "$PKGDEST"/$apk "$apkcache"/$apk + set -- "$@" "$apkcache"/$apk done - # update the abuildrepo cache here + # update the apkcache cache here msg "Updating the cached abuild repository index..." - update_abuildrepo_index "$@" + update_apkcache_index "$@" } # predefined splitfunc doc @@ -644,7 +644,7 @@ builddeps() { uninstall_after=".makedepends-$pkgname $uninstall_after" if [ -n "$install_deps" ]; then - $SUDO apk add --repo "$abuildrepo" \ + $SUDO apk add --repo "$apkcache" \ --virtual .makedepends-$pkgname $deps \ && return 0 fi @@ -656,9 +656,9 @@ builddeps() { local dir=${i#*:} local pkg=${i%:*} msg "Entering $dir" - cd "$dir" && $0 -k -r abuildrepo || return 1 + cd "$dir" && $0 -k -r apkcache || return 1 done - $SUDO apk add --repo "$abuildrepo" \ + $SUDO apk add --repo "$apkcache" \ --virtual .makedepends-$pkgname $deps } @@ -794,7 +794,7 @@ newaport() { installdeps() { local deps i - sudo apk add --repo "$abuildrepo" --virtual .makedepends-$pkgname \ + sudo apk add --repo "$apkcache" --virtual .makedepends-$pkgname \ $makedepends } |