From 0115186fd5f66f5a87a450ad75a955c7ae9fdc06 Mon Sep 17 00:00:00 2001 From: Matthew Blissett Date: Fri, 23 Jan 2015 12:41:31 +0000 Subject: [PATCH 1/2] refine script shell changed to Bash, as it uses Bash syntax. "-e" option added so script exits after an unexpected error. --- refine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refine b/refine index ca901759c..d4d8b438d 100755 --- a/refine +++ b/refine @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash -e ########################################################## # OpenRefine Control System # From 0e791510233be1b3befba5fc657af09a93603dcf Mon Sep 17 00:00:00 2001 From: Matthew Blissett Date: Fri, 23 Jan 2015 15:29:43 +0000 Subject: [PATCH 2/2] Removed -e from refine script and removed dud line from server_test. $RUN_CMD is always empty in server_test. --- refine | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/refine b/refine index d4d8b438d..a37f13251 100755 --- a/refine +++ b/refine @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash ########################################################## # OpenRefine Control System # @@ -15,12 +15,12 @@ exit 1 } error() { - echo "$1" + echo "Error: $1" exit 1 } warn() { - echo "$1" + echo "Warning: $1" exit 0 } @@ -633,8 +633,6 @@ ui_test() { server_test() { ant server_test - - $RUN_CMD || error "Failed passing server tests" } run() {