RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abuild: rename pkgdirbase to pkgbasedir

This commit is contained in:
Natanael Copa 2009-05-08 18:21:12 +02:00 committed by Natanael Copa
parent 231d406de6
commit 2fd4128e20
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.in
View File

@ -13,7 +13,7 @@ sysconfdir=@sysconfdir@
startdir="$PWD" startdir="$PWD"
srcdir=${srcdir:-"$startdir/src"} srcdir=${srcdir:-"$startdir/src"}
pkgdirbase=${pkgdirbase:-"$startdir/pkg"} pkgbasedir=${pkgbasedir:-"$startdir/pkg"}
pkgrel=0 pkgrel=0
repo=${startdir%/*} repo=${startdir%/*}
repo=${repo##*/} repo=${repo##*/}
@ -213,7 +213,7 @@ unpack() {
clean() { clean() {
msg "Cleaning temporary build dirs..." msg "Cleaning temporary build dirs..."
rm -rf "$srcdir" rm -rf "$srcdir"
rm -rf "$pkgdirbase" rm -rf "$pkgbasedir"
} }
# cleanup fetched sources # cleanup fetched sources
@ -279,7 +279,7 @@ prepare_subpackages() {
local func=$(get_split_func $i) local func=$(get_split_func $i)
# call abuild recursively, setting subpkg{dir,name} # call abuild recursively, setting subpkg{dir,name}
msg "Running split function $func..." msg "Running split function $func..."
subpkgdir="$pkgdirbase/${i%:*}" subpkgname="${i%:*}" \ subpkgdir="$pkgbasedir/${i%:*}" subpkgname="${i%:*}" \
$0 $func prepare_package || return 1 $0 $func prepare_package || return 1
done done
} }
@ -379,7 +379,7 @@ pkginfo_val() {
create_apks() { create_apks() {
local file local file
for file in "$pkgdirbase"/*/.PKGINFO; do for file in "$pkgbasedir"/*/.PKGINFO; do
local dir="${file%/.PKGINFO}" local dir="${file%/.PKGINFO}"
local name=$(pkginfo_val pkgname $file) local name=$(pkginfo_val pkgname $file)
local ver=$(pkginfo_val pkgver $file) local ver=$(pkginfo_val pkgver $file)
@ -841,7 +841,7 @@ if [ -n "$subpkgname" ]; then
subpackages= subpackages=
install= install=
fi fi
pkgdir="${pkgdirbase}/$pkgname" pkgdir="$pkgbasedir/$pkgname"
trap 'die "Aborted by user"' INT trap 'die "Aborted by user"' INT
set_xterm_title "abuild: $pkgname" set_xterm_title "abuild: $pkgname"