[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: use make_boolean more often, use more quoting.
git-admin at x2go.org
git-admin at x2go.org
Thu Apr 2 01:20:47 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 9ff437544fb9b2a0619bf4f21bf85bdd8ef9d9b0
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Apr 2 01:20:39 2015 +0200
bin/build-rpm-package: use make_boolean more often, use more quoting.
---
bin/build-rpm-package | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 947f108..0fda18c 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -882,8 +882,10 @@ delay_build() {
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
+ 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
@@ -895,7 +897,7 @@ set_vars "$@" && {
unlock_workspace
}
fi
- if [ "x$(basename $0)" = "x$PREFIX-upload-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then
+ if [ "x$(basename $0)" = "x${PREFIX}-upload-rpm-package" ] || [ "x$(basename $0)" = "x${PREFIX}-build+upload-rpm-package" ]; then
upload_packages
fi
}
--
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