This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 9ff4375 bin/build-rpm-package: use make_boolean more often, use more quoting. new c1b849d bin/build-rpm-package: use more curly braces. new 56b8bee bin/build-rpm-package: fix parse error. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-rpm-package | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit c1b849d58553695d43dc04dd2f499ea1f6a9ccdf Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 2 01:41:57 2015 +0200 bin/build-rpm-package: use more curly braces. --- bin/build-rpm-package | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 0fda18c..9262d40 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -880,11 +880,10 @@ delay_build() { ### MAIN ### 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. + if [ "x$(basename $0)" = "x${PREFIX}-build-rpm-package" ] || [ "x$(basename $0)" = "x${PREFIX}-build+upload-rpm-package" ]; then FORCE_BUILD="$(make_boolean "${FORCE_BUILD}")" NO_DELAY="$(make_boolean "${NO_DELAY}")" - cd $PROJECT_DIR && { pkgneedsbuild $CHECKOUT || [ "${FORCE_BUILD}" -eq "1" ] } && { + cd ${PROJECT_DIR} && { pkgneedsbuild ${CHECKOUT} || [ "${FORCE_BUILD}" -eq "1" ] } && { if [ "${FORCE_BUILD}" -eq "1" ] && [ "${NO_DELAY}" -eq "0" ]; then delay_build fi -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 56b8bee5a2101bb43edbacf7c0b081509d2e638e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 2 01:42:16 2015 +0200 bin/build-rpm-package: fix parse error. --- bin/build-rpm-package | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 9262d40..1bb548d 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -883,7 +883,12 @@ set_vars "$@" && { if [ "x$(basename $0)" = "x${PREFIX}-build-rpm-package" ] || [ "x$(basename $0)" = "x${PREFIX}-build+upload-rpm-package" ]; then FORCE_BUILD="$(make_boolean "${FORCE_BUILD}")" NO_DELAY="$(make_boolean "${NO_DELAY}")" - cd ${PROJECT_DIR} && { pkgneedsbuild ${CHECKOUT} || [ "${FORCE_BUILD}" -eq "1" ] } && { + + # This indentation may look weird, but is actually needed because bash expects either a semicolon or a newline + # between (the last) command and a closing curly brace. + cd "${PROJECT_DIR}" && { + pkgneedsbuild "${CHECKOUT}" || [ "${FORCE_BUILD}" -eq "1" ] + } && { if [ "${FORCE_BUILD}" -eq "1" ] && [ "${NO_DELAY}" -eq "0" ]; then delay_build fi -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git