Commit 2fd4128e authored by Natanael Copa's avatar Natanael Copa Committed by Natanael Copa
Browse files

abuild: rename pkgdirbase to pkgbasedir

parent 231d406d
...@@ -13,7 +13,7 @@ sysconfdir=@sysconfdir@ ...@@ -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() { ...@@ -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() { ...@@ -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() { ...@@ -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 ...@@ -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"
......
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