From e1e4795e4e1277fd28ecb33be763b148a9a6df64 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 29 Jan 2015 04:04:36 +0100
Subject: bin/build-{deb,nsis,rpm}-package: fix FORCE_BUILD and NO_DELAY logic
 to treat any value other than "no" or "0" as true.

---
 bin/build-rpm-package | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin/build-rpm-package')

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index d923b76..0680e4e 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -453,8 +453,9 @@ delay_build() {
 ### MAIN ###
 set_vars $@ && {
 	if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then
-		cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && {
-			if [ "x$FORCE_BUILD" = "xyes" ] && [ "x$NO_DELAY" != "xyes" ]; then
+								# Treat any value other than "no" and "0" as true.
+		cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && {
+			if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then
 				delay_build
 			fi
 			lock_workspace
-- 
cgit v1.2.3