From a9e04331de9ba972be9d394da32439fb3054707c Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Thu, 11 Aug 2016 15:02:33 +0100 Subject: [PATCH] Ensure EXIT_CODE is set. Kill Galaxy for local testing Also properly initialise $i and use POSIX syntax --- .ci/first_startup.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.ci/first_startup.sh b/.ci/first_startup.sh index e0700d9e81e..a05a3cf5388 100644 --- a/.ci/first_startup.sh +++ b/.ci/first_startup.sh @@ -1,15 +1,16 @@ -#!/bin/bash +#!/bin/sh TRIES=120 URL=http://localhost:8080 +EXIT_CODE=1 +i=0 echo "Testing for correct startup:" bash run.sh --daemon && \ -while [[ $i -le $TRIES ]] -do - curl "$URL" && EXIT_CODE=0 && break - sleep 1 - EXIT_CODE=1 - ((i = i + 1)) -done + while [ "$i" -le $TRIES ]; do + curl "$URL" && EXIT_CODE=0 && break + sleep 1 + i=$((i + 1)) + done +kill -9 "$(cat paster.pid)" echo "exit code:$EXIT_CODE, showing startup log:" cat paster.log exit $EXIT_CODE