[X2Go-Commits] [buildscripts] 01/01: bin/build-{deb, nsis, rpm}-package: fix NO_DELAY logic once again and this time correctly.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 5bc1bd9c898634ad4255dbe2bd86f527cf2ea56a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jan 29 04:28:51 2015 +0100

    bin/build-{deb,nsis,rpm}-package: fix NO_DELAY logic once again and this time correctly.
---
 bin/build-deb-package     |    2 +-
 bin/build-nsis-package.sh |    2 +-
 bin/build-rpm-package     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 38bb18b..efed4e3 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -347,7 +347,7 @@ set_vars $@ && {
 	if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; 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
+			if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then
 				delay_build
 			fi
 			lock_workspace
diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh
index 0aa6e9a..42fed20 100755
--- a/bin/build-nsis-package.sh
+++ b/bin/build-nsis-package.sh
@@ -270,7 +270,7 @@ set_vars $@ && {
 	if [ "x$(basename $0)" = "xbuild-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; 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
+			if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then
 				delay_build
 			fi
 			lock_workspace
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index e0b514e..0680e4e 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -455,7 +455,7 @@ set_vars $@ && {
 	if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; 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
+			if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then
 				delay_build
 			fi
 			lock_workspace

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git