diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-01-29 04:28:51 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-01-29 04:28:51 +0100 |
| commit | 5bc1bd9c898634ad4255dbe2bd86f527cf2ea56a (patch) | |
| tree | 13945e2a37dd5720812ef62094534b69bd6d754a /bin | |
| parent | 73009d54fe2ff297e9694a84e05dd7bc591f69d0 (diff) | |
| download | buildscripts-5bc1bd9c898634ad4255dbe2bd86f527cf2ea56a.tar.gz buildscripts-5bc1bd9c898634ad4255dbe2bd86f527cf2ea56a.tar.bz2 buildscripts-5bc1bd9c898634ad4255dbe2bd86f527cf2ea56a.zip | |
bin/build-{deb,nsis,rpm}-package: fix NO_DELAY logic once again and this time correctly.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-deb-package | 2 | ||||
| -rwxr-xr-x | bin/build-nsis-package.sh | 2 | ||||
| -rwxr-xr-x | 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 |