diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-08 16:00:41 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-08 16:00:41 -0600 |
| commit | 9fc855b9c4af0e372fa50e1da1ec26d4f2fc5661 (patch) | |
| tree | 4dd3b2b126a00fd81935daf747355ea2102cd27c /src | |
| parent | 724cc90d771d840c4579e3b2443cad21fd6fe231 (diff) | |
librestage: handle PKGDEST better, fix testsv20130608
Diffstat (limited to 'src')
| -rwxr-xr-x | src/abslibre-tools/librestage | 3 |
1 files changed, 2 insertions, 1 deletions
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 |