From 5ae6de4f1d98070618969e2303da9ca9395282a8 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 19 Dec 2014 14:01:13 +0100 Subject: [PATCH] jenkins: fix cloudbees script (commands must return 0) --- jenkins/cloudbees_build | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build index 3eaddc5..0e77941 100644 --- a/jenkins/cloudbees_build +++ b/jenkins/cloudbees_build @@ -15,7 +15,9 @@ DEFAULT_BASE=3.14.12.4 BASE=${1:-${DEFAULT_BASE}} -[ "${1}" = ${DEFAULT_BASE} -o -z "${1}" ] && BUILD_DOCS=YES +if [ "${1}" = "${DEFAULT_BASE}" -o -z "${1}" ]; then + BUILD_DOCS=YES +fi ########################################### # Fetch and unpack dependencies @@ -46,7 +48,9 @@ EPICS_BASE=${EPICS_BASE} EOF make distclean all -[ "${BUILD_DOCS}" ] && doxygen +if [ "${BUILD_DOCS}" ]; then + doxygen +fi ########################################### # Test @@ -62,4 +66,6 @@ tar czf pvData.CB-dist.tar.gz lib include COPYRIGHT LICENSE ########################################### # Publish documentation -[ "${BUILD_DOCS}" ] && rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvDataCPP/tip +if [ "${BUILD_DOCS}" ]; then + rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvDataCPP/tip +fi