From ac2da34a3accea357796d799fe62dae3425954e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sat, 19 Jan 2019 00:45:12 +0000
Subject: subr/pkg_install.subr:pkg_install(): fix typo.
 subr/pkg_install_rpm.subr:pkg_install_rpm(): reintroduce rpmbuild check.

---
 subr/pkg_install.subr     | 2 +-
 subr/pkg_install_rpm.subr | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'subr')

diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index cd55fdb4..14cd8a0b 100644
--- a/subr/pkg_install.subr
+++ b/subr/pkg_install.subr
@@ -18,7 +18,7 @@ pkg_install() {
 		tar -C "${PKG_DESTDIR}" -cpf - .	|\
 			gzip -c -9 - > "${PKG_BASE_DIR}/${PKG_NAME}.tgz"
 	fi;
-	if [ [ "${PKG_PKGLIST_DISABLE:-0}" -eq 0 ]; then
+	if [ "${PKG_PKGLIST_DISABLE:-0}" -eq 0 ]; then
 		if [ ! -e "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" ]; then
 			touch "${PREFIX}/pkglist.${PKG_BUILD_TYPE}";
 		fi;
diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr
index 856370d0..cd920eb6 100644
--- a/subr/pkg_install_rpm.subr
+++ b/subr/pkg_install_rpm.subr
@@ -5,7 +5,8 @@
 pkg_install_rpm() {
 	local _pkg_url="" _pkg_version_full="" _pkg_version_rpm="";
 	if [ "${ARG_RPM:-0}" -eq 0 ]\
-	|| [ "${PKG_RPM_DISABLE:-0}" -eq 1 ]; then
+	|| [ "${PKG_RPM_DISABLE:-0}" -eq 1 ]\
+	|| ! [ -x "$(which rpmbuild 2>/dev/null)" ]; then
 		return 0;
 	fi; 
 	if [ -n "${PKG_URL}" ]; then
-- 
cgit v1.2.3