From 61ccd93d456a471eba133cb7ea4760a6d8b97b7e Mon Sep 17 00:00:00 2001
From: bombcar <github@bombcar.com>
Date: Sat, 12 Feb 2022 23:45:18 -0600
Subject: update buildscript for maven

---
 .github/scripts/test-no-error-reports.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 .github/scripts/test-no-error-reports.sh

(limited to '.github/scripts')

diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh
old mode 100644
new mode 100755
index e3876606d5..84c1e5d650
--- a/.github/scripts/test-no-error-reports.sh
+++ b/.github/scripts/test-no-error-reports.sh
@@ -1,22 +1,28 @@
-if [[ -d "run/crash-reports" ]]; then
+#!/usr/bin/env bash
+
+RUNDIR="run"
+CRASH="crash-reports"
+SERVERLOG="server.log"
+
+if [[ -d $RUNDIR/$CRASH ]]; then
   echo "Crash reports detected:"
-  cat $directory/*
+  cat $RUNDIR/$CRASH/crash*.txt
   exit 1
 fi
 
-if grep --quiet "Fatal errors were detected" server.log; then
+if grep --quiet "Fatal errors were detected" $SERVERLOG; then
   echo "Fatal errors detected:"
   cat server.log
   exit 1
 fi
 
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
   echo "Server force stopped:"
   cat server.log
   exit 1
 fi
 
-if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
+if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
   echo "Server didn't finish startup:"
   cat server.log
   exit 1
-- 
cgit