diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-01-29 04:04:36 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-01-29 04:07:24 +0100 |
| commit | e1e4795e4e1277fd28ecb33be763b148a9a6df64 (patch) | |
| tree | f79077d9a9e5f184b9c611102e874e00927415c7 | |
| parent | a320e9381cf06784d791a29c23eb5dd15d94fd9d (diff) | |
| download | buildscripts-e1e4795e4e1277fd28ecb33be763b148a9a6df64.tar.gz buildscripts-e1e4795e4e1277fd28ecb33be763b148a9a6df64.tar.bz2 buildscripts-e1e4795e4e1277fd28ecb33be763b148a9a6df64.zip | |
bin/build-{deb,nsis,rpm}-package: fix FORCE_BUILD and NO_DELAY logic to treat any value other than "no" or "0" as true.
| -rwxr-xr-x | bin/build-deb-package | 5 | ||||
| -rwxr-xr-x | bin/build-nsis-package.sh | 5 | ||||
| -rwxr-xr-x | bin/build-rpm-package | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/bin/build-deb-package b/bin/build-deb-package index 0ac9f1d..ba6ce14 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -344,8 +344,9 @@ delay_build() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { - if [ "x$FORCE_BUILD" = "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" ]; then delay_build fi lock_workspace diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index 64087a6..aec26a4 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -267,8 +267,9 @@ delay_build() { ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "xbuild-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; then - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { - if [ "x$FORCE_BUILD" = "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" ]; then delay_build fi lock_workspace 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 |