X-Git-Url: http://jaekl.net/gitweb/?p=cfb.git;a=blobdiff_plain;f=jenkins_invoke.sh;h=804b8f4b23f2a252d9b7db69958b450ee8d85677;hp=d3e1b00a3a3785c65905c299a3e89d02b78d2827;hb=HEAD;hpb=9b78bc1d1aa24320a7d946944d047273db82db84

diff --git a/jenkins_invoke.sh b/jenkins_invoke.sh
index d3e1b00..804b8f4 100755
--- a/jenkins_invoke.sh
+++ b/jenkins_invoke.sh
@@ -2,6 +2,8 @@
 
 set -o nounset   ## (set -u) error exit on attempts to deref undefined variable
 set -o errexit   ## (set -e) error exit if subcommand returns nonzero
+set -o pipefail  ## propagate error exit down pipe
+set -o errtrace  ## propagate error across time and similar commands
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -13,7 +15,10 @@ export FINDBUGS_HOME=${SCRIPT_DIR}/../findbugs-3.0.1
 echo CLASSPATH=${CLASSPATH}
 echo FINDBUGS_HOME=${FINDBUGS_HOME}
 
-rm cfb.fbp
+if [ -e cfb.fbp ]; then
+  rm cfb.fbp
+fi
+
 cat >cfb.fbp <<EOF
 <Project projectName="CFB">
   <Jar>${WORKSPACE}/bin</Jar>
@@ -21,5 +26,6 @@ cat >cfb.fbp <<EOF
 </Project>
 EOF
 
-cat cfb.fbp
-./go.sh -c ${SCRIPT_DIR}/config.properties -d cfb -u cfb -p cfb -f cfb.fbp -n jenkins_${JOB_NAME}_${BUILD_NUMBER} -o ${OUT_FILE}
+#cat cfb.fbp
+cd ${SCRIPT_DIR}
+bash -x ./go.sh -c ${SCRIPT_DIR}/config.properties -d cfb -u cfb -p cfb -f cfb.fbp -j ${JOB_NAME} -n jenkins_${JOB_NAME}_${BUILD_NUMBER} -o ${OUT_FILE}