AzaezelLinux/abuild
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

abuild: use new apk-tools (2.x)

Browse Source
This commit is contained in:
Natanael Copa 2009-01-15 16:40:43 +00:00
parent d992b4aee5
commit a457f7241c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
abuild
View File

@ -8,7 +8,7 @@
# Depends on: busybox utilities, fakeroot, # Depends on: busybox utilities, fakeroot,
# #
abuild_ver=1.2 abuild_ver=1.3
# read config # read config
MAKEAPK_CONF=${MAKEAPK_CONF:-/etc/abuild.conf} MAKEAPK_CONF=${MAKEAPK_CONF:-/etc/abuild.conf}
@ -49,7 +49,7 @@ set_xterm_title() {
cleanup() { cleanup() {
set_xterm_title "" set_xterm_title ""
if [ -z "$install_after" ] && [ -n "$uninstall_after" ]; then if [ -z "$install_after" ] && [ -n "$uninstall_after" ]; then
sudo apk_delete $uninstall_after sudo apk delete $uninstall_after
fi fi
} }
@ -438,7 +438,7 @@ deptrace() {
( depparse_aports ( depparse_aports
if [ -z "$upgrade" ]; then if [ -z "$upgrade" ]; then
# list installed pkgs and prefix with 'i ' # list installed pkgs and prefix with 'i '
apk_info | sed 's/-[0-9].*//; s/^/i /' apk info | sed 's/-[0-9].*//; s/^/i /'
fi fi
) | awk -v pkgs="$BUILD_BASE $depends $makedepends" ' ) | awk -v pkgs="$BUILD_BASE $depends $makedepends" '
@ -471,7 +471,7 @@ builddeps() {
deps="$BUILD_BASE $depends $makedepends" deps="$BUILD_BASE $depends $makedepends"
if [ -z "$recursive" ]; then if [ -z "$recursive" ]; then
for i in $deps; do for i in $deps; do
apk_info -e $i || die "Missing dependency $i. Use -r to build recursively" apk info -e $i || die "Missing dependency $i. Use -r to build recursively"
done done
return 0 return 0
fi fi
@ -602,7 +602,7 @@ while [ $# -gt 0 ]; do
done done
for i in $install_after; do for i in $install_after; do
sudo apk_add -s -u $PKGDEST/$i-$pkgver-r$pkgrel.apk \ sudo apk add $PKGDEST/$i-$pkgver-r$pkgrel.apk \
|| die "Failed to install $i" || die "Failed to install $i"
done done