summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-05-08 18:21:12 +0200
committerNatanael Copa <natanael.copa@gmail.com>2009-05-08 19:19:32 +0200
commit2fd4128e2041adf5b662427da6dc4e42394b04ac (patch)
tree5f10012763df45b26a2d31d5a2b42e3b1af80ab5
parent231d406de612a7afaeee656f1663e50f7697aff9 (diff)
downloadabuild-2fd4128e2041adf5b662427da6dc4e42394b04ac.tar.gz
abuild-2fd4128e2041adf5b662427da6dc4e42394b04ac.tar.bz2
abuild-2fd4128e2041adf5b662427da6dc4e42394b04ac.tar.xz
abuild-2fd4128e2041adf5b662427da6dc4e42394b04ac.zip
abuild: rename pkgdirbase to pkgbasedir
-rwxr-xr-xabuild.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/abuild.in b/abuild.in
index 0878404..07dc4ea 100755
--- a/abuild.in
+++ b/abuild.in
@@ -13,7 +13,7 @@ sysconfdir=@sysconfdir@
startdir="$PWD"
srcdir=${srcdir:-"$startdir/src"}
-pkgdirbase=${pkgdirbase:-"$startdir/pkg"}
+pkgbasedir=${pkgbasedir:-"$startdir/pkg"}
pkgrel=0
repo=${startdir%/*}
repo=${repo##*/}
@@ -213,7 +213,7 @@ unpack() {
clean() {
msg "Cleaning temporary build dirs..."
rm -rf "$srcdir"
- rm -rf "$pkgdirbase"
+ rm -rf "$pkgbasedir"
}
# cleanup fetched sources
@@ -279,7 +279,7 @@ prepare_subpackages() {
local func=$(get_split_func $i)
# call abuild recursively, setting subpkg{dir,name}
msg "Running split function $func..."
- subpkgdir="$pkgdirbase/${i%:*}" subpkgname="${i%:*}" \
+ subpkgdir="$pkgbasedir/${i%:*}" subpkgname="${i%:*}" \
$0 $func prepare_package || return 1
done
}
@@ -379,7 +379,7 @@ pkginfo_val() {
create_apks() {
local file
- for file in "$pkgdirbase"/*/.PKGINFO; do
+ for file in "$pkgbasedir"/*/.PKGINFO; do
local dir="${file%/.PKGINFO}"
local name=$(pkginfo_val pkgname $file)
local ver=$(pkginfo_val pkgver $file)
@@ -841,7 +841,7 @@ if [ -n "$subpkgname" ]; then
subpackages=
install=
fi
-pkgdir="${pkgdirbase}/$pkgname"
+pkgdir="$pkgbasedir/$pkgname"
trap 'die "Aborted by user"' INT
set_xterm_title "abuild: $pkgname"