oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: rename abuildrepo to apkcache

Browse Source
This commit is contained in:
Natanael Copa 2009-06-03 11:26:48 +00:00
parent 9d616a1346
commit 36080a48f7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
abuild.in
View File

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