From 9fc855b9c4af0e372fa50e1da1ec26d4f2fc5661 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 8 Jun 2013 16:00:41 -0600
Subject: librestage: handle PKGDEST better, fix tests

---
 src/abslibre-tools/librestage | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage
index 16dc772..6eba8dd 100755
--- a/src/abslibre-tools/librestage
+++ b/src/abslibre-tools/librestage
@@ -60,6 +60,7 @@ main() {
 	# Load configuration
 	load_files libretools
 	check_vars libretools WORKDIR ARCHES || return 1
+	load_files makepkg # for PKGDEST, which is optional
 
 	# Load the PKGBUILD
 	source ./PKGBUILD
@@ -69,7 +70,7 @@ main() {
 	for CARCH in "${ARCHES[@]}" any; do
 		for _pkgname in "${pkgname[@]}"; do
 			pkgfile=${_pkgname}-$(get_full_version $_pkgname)-${CARCH}${PKGEXT}
-			pkgpath="$(find . "$PKGDEST" -maxdepth 1 -type f -name "$pkgfile"|sed 1q)"
+			pkgpath="$(find . "${PKGDEST:-.}" -maxdepth 1 -type f -name "$pkgfile"|sed 1q)"
 
 			if [[ ! -f "${pkgpath}" ]]; then
 				continue
-- 
cgit v1.2.3-54-g00ecf