[X2Go-Commits] [buildscripts] 04/04: bin/build-{deb-package, nsis-package.sh}: replace some more common logic regarding (dynamic) binary variables.

git-admin at x2go.org git-admin at x2go.org
Sun May 10 05:52:32 CEST 2015


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 57dda5c95d5f250f88baca32b1b2ad958d752cdb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun May 10 05:51:51 2015 +0200

    bin/build-{deb-package,nsis-package.sh}: replace some more common logic regarding (dynamic) binary variables.
---
 bin/build-deb-package     |   10 +++++++---
 bin/build-nsis-package.sh |   10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 2d0adef..9f8f151 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -403,9 +403,13 @@ delay_build() {
 ### MAIN ###
 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
+		FORCE_BUILD="$(make_boolean "${FORCE_BUILD}")"
+		NO_DELAY="$(make_boolean "${NO_DELAY}")"
+
+		cd "${PROJECT_DIR}" && {
+			pkgneedsbuild "${CHECKOUT}" || [ "${FORCE_BUILD}" -eq "1" ]
+		} && {
+			if [ "${FORCE_BUILD}" -eq "1" ] && [ "${NO_DELAY}" -eq "0" ]; then
 				delay_build
 			fi
 			lock_workspace
diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh
index af2d5a1..5c99ed3 100755
--- a/bin/build-nsis-package.sh
+++ b/bin/build-nsis-package.sh
@@ -298,9 +298,13 @@ delay_build() {
 ### MAIN ###
 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
+		FORCE_BUILD="$(make_boolean "${FORCE_BUILD}")"
+		NO_DELAY="$(make_boolean "${NO_DELAY}")"
+
+		cd "${PROJECT_DIR}" && {
+			pkgneedsbuild "${CHECKOUT}" || [ "${FORCE_BUILD}" -eq "1" ]
+		} && {
+			if [ "${FORCE_BUILD}" -eq "1" ] && [ "${NO_DELAY}" -eq "0" ]; then
 				delay_build
 			fi
 			lock_workspace

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


More information about the x2go-commits mailing list