From 5ea8350852907eed656d8af7e81e10618214ddf3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 1 Jul 2014 13:32:09 -0400 Subject: grep for simple-to-fix issues with loading PKGBUILDs --- doc/treepkg.md | 2 +- src/xbs-abslibre/helper-abslibre | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/treepkg.md b/doc/treepkg.md index 1e30e33..aca7f2a 100644 --- a/doc/treepkg.md +++ b/doc/treepkg.md @@ -64,7 +64,7 @@ Your HOOKLOCALRELEASE script should look like this: # Get needed vars source /etc/makepkg.conf source /etc/libretools.conf - source PKGBUILD + source ./PKGBUILD unset build package check diff --git a/src/xbs-abslibre/helper-abslibre b/src/xbs-abslibre/helper-abslibre index ce21b99..2e5ed27 100755 --- a/src/xbs-abslibre/helper-abslibre +++ b/src/xbs-abslibre/helper-abslibre @@ -37,7 +37,7 @@ release() { . $(librelib conf) load_files libretools check_vars libretools WORKDIR ABSLIBREDEST || return 1 - local pkgbase="$(load_PKGBUILD; printf '%s\n' "${pkgbase:-${pkgname}}")" + local pkgbase="$(load_PKGBUILD >/dev/null; printf '%s\n' "${pkgbase:-${pkgname}}")" local pkgdir="${ABSLIBREDEST}/${arch}/${repo}/${pkgbase}" lock 9 "${ABSLIBREDEST}/${arch}.lock" "Waiting for a lock on the ABSLibre release directory for ${arch}" @@ -65,7 +65,7 @@ unrelease() { load_files libretools check_vars libretools ABSLIBREDEST || return 1 - local pkgbase="$(load_PKGBUILD; printf '%s\n' "${pkgbase:-${pkgname}}")" + local pkgbase="$(load_PKGBUILD >/dev/null; printf '%s\n' "${pkgbase:-${pkgname}}")" local pkgdir="${ABSLIBREDEST}/${arch}/${repo}/${pkgbase}" lock 9 "${ABSLIBREDEST}/${arch}.lock" "Waiting for a lock on the ABSLibre release directory for ${arch}" -- cgit v1.2.2