summaryrefslogtreecommitdiff
path: root/mason/mason-report.sh
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-01 18:40:41 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-17 11:39:19 +0100
commit34872e2636ed058a414ee7c66634accb754e8840 (patch)
tree2640c2da350d4de41df9ef57327f2821439ac620 /mason/mason-report.sh
parent04abe5fab7e2cc3a874f6d70ef92051096517e5f (diff)
downloaddefinitions-34872e2636ed058a414ee7c66634accb754e8840.tar.gz
Move Mason out from /root
- Move the configuration file to /etc/mason.conf - Move the scripts to /usr/lib/mason/ - Mason will store the report in /var/mason/report.html
Diffstat (limited to 'mason/mason-report.sh')
-rwxr-xr-xmason/mason-report.sh6
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