diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 11:42:03 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 11:42:03 +0100 |
| commit | 0f4f5d119c0deeee4806d33d688e735496a0e7ab (patch) | |
| tree | e8027168300e135534d32ac7ce365a8d4a938a54 /mason/mason-report.sh | |
| parent | 0f11a6cbe1f4a70279c06ecdacaea942db36c209 (diff) | |
| parent | 950017e5621bf5eac6ea13e9340194a6559b2bb1 (diff) | |
| download | definitions-0f4f5d119c0deeee4806d33d688e735496a0e7ab.tar.gz | |
Merge branch 'baserock/pedroalvarez/generic-mason3'
Reviewed-by: Richard Maw
Reviewed-by: Sam Thursfield
Diffstat (limited to 'mason/mason-report.sh')
| -rwxr-xr-x | mason/mason-report.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mason/mason-report.sh b/mason/mason-report.sh index 23182cc9..9c20b65b 100755 --- a/mason/mason-report.sh +++ b/mason/mason-report.sh @@ -2,9 +2,9 @@ set -x -. /root/mason.conf +. /etc/mason.conf -REPORT_PATH=/root/report.html +REPORT_PATH=/var/mason/report.html SERVER_PATH=/srv/mason sed_escape() { @@ -210,7 +210,7 @@ update_report_time "$START_TIME" cp "$REPORT_PATH" "$SERVER_PATH/index.html" logfile="$(mktemp)" -/root/mason.sh 2>&1 | tee "$logfile" +/usr/lib/mason/mason.sh 2>&1 | tee "$logfile" case "${PIPESTATUS[0]}" in 0) RESULT=pass |