Commit 3ac0a8e0 authored by Natanael Copa's avatar Natanael Copa

abuild: move abuildrepo to ~/.cache/abuild/$repo

We no require apk-tools-2.1
parent 8f6f8763
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
abuild_ver=@VERSION@ abuild_ver=@VERSION@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
abuildrepo=@abuildrepo@ abuildrepo_base=@abuildrepo@
datadir=@datadir@ datadir=@datadir@
program=${0##*/} program=${0##*/}
...@@ -1009,31 +1009,20 @@ apk_up2date() { ...@@ -1009,31 +1009,20 @@ apk_up2date() {
abuildindex_up2date() { abuildindex_up2date() {
local i local i
getpkgver || return 1 getpkgver || return 1
for i in $pkgname $subpackages; do local dir="$abuildrepo"/$CARCH
local found= dir= local apk="${pkgname%:*}-$pkgver-r$pkgrel.apk"
local apk="${i%:*}-$pkgver-r$pkgrel.apk" local idx="$dir"/APKINDEX.tar.gz
local file="$dir"/$apk
# look for file in all arch dirs
for dir in "$abuildrepo"/*; do # check if index is missing
[ -d "$dir" ] || continue [ -f "$idx" ] || return 1
local file="$dir"/$apk
local idx="$dir"/APKINDEX.tar.gz
# check if index is missing
[ -f "$idx" ] || return 1
# check if file is there but is newer than index # if link or file is missing, then we need update abuildrepo index
if [ -f "$file" ]; then [ -f "$file" ] || return 1
found=1
if [ "$file" -nt "$idx" ]; then # if file exists and is newer than index, then we need update index
return 1 [ "$file" -nt "$idx" ] && return 1
fi
fi
done
# we are not up2date if file was not found in any arch dir
[ -z "$found" ] && return 1
done
return 0 return 0
} }
...@@ -1427,6 +1416,7 @@ pkgbasedir=${pkgbasedir:-"$startdir/pkg"} ...@@ -1427,6 +1416,7 @@ pkgbasedir=${pkgbasedir:-"$startdir/pkg"}
pkgrel=0 pkgrel=0
repo=${startdir%/*} repo=${startdir%/*}
repo=${repo##*/} repo=${repo##*/}
abuildrepo="$abuildrepo_base"/$repo
SRCDEST=${SRCDEST:-$startdir} SRCDEST=${SRCDEST:-$startdir}
PKGDEST=${PKGDEST:-$startdir} PKGDEST=${PKGDEST:-$startdir}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment