Replace processonelog2.sh with processonelog2.awk

Submitted by:	Freddy DISSAUX

4 files changed, 15 insertions, 23 deletions

diff --git a/src/share/poudriere/awk/processonelog2.awk b/src/share/poudriere/awk/processonelog2.awk
new file mode 100644
index 00000000..cd68a168
--- /dev/null
+++ b/src/share/poudriere/awk/processonelog2.awk
@@ -0,0 +1,13 @@
+# Read a single errorlogfile and output a phase
+/Filesystem touched during build/	{ res[0]="build_fs_violation" }
+/Filesystem touched during stage/	{ res[1]="stage_fs_violation" }
+/Files or directories orphaned/		{ res[2]="stage_orphans" }
+/stage\-qa failures/			{ res[3]="stage-qa" }
+/Files or directories (left over|removed|modified)/	{ res[4]="leftovers" }
+
+END {
+	for(i=0; i<5; i++) {
+		if (res[i]) { print res[i]; exit; }
+	}
+	print "???"
+}
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 34002245..3a6363e8 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -2234,7 +2234,7 @@ build_pkg() {
 			build_failed=1
 			# ret=2 is a test failure
 			if [ ${ret} -eq 2 ]; then
-				failed_phase=$(/bin/sh ${SCRIPTPREFIX}/processonelog2.sh \
+				failed_phase=$(awk -f ${AWKPREFIX}/processonelog2.awk \
 					${log}/logs/${PKGNAME}.log \
 					2> /dev/null)
 			else
diff --git a/src/share/poudriere/processonelog2.sh b/src/share/poudriere/processonelog2.sh
deleted file mode 100644
index d9bf0c95..00000000
--- a/src/share/poudriere/processonelog2.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Read a single errorlogfile and output a phase
-
-filename=$1
-
-if grep -qF "Filesystem touched during build" $1; then
-  phase="build_fs_violation"
-elif grep -qF "Filesystem touched during stage" $1; then
-  phase="stage_fs_violation"
-elif grep -qF "Files or directories orphaned" $1; then
-  phase="stage_orphans"
-elif grep -qF "stage-qa failures" $1; then
-  phase="stage-qa"
-elif grep -qE "Files or directories (left over|removed|modified)" $1; then
-  phase="leftovers"
-else
-  phase="???"
-fi
-
-echo "$phase"
-
diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh
index 2696ad48..1847ea2b 100755
--- a/src/share/poudriere/testport.sh
+++ b/src/share/poudriere/testport.sh
@@ -204,7 +204,7 @@ ret=0
 build_port /usr/ports/${ORIGIN} || ret=$?
 if [ ${ret} -ne 0 ]; then
 	if [ ${ret} -eq 2 ]; then
-		failed_phase=$(/bin/sh ${SCRIPTPREFIX}/processonelog2.sh \
+		failed_phase=$(awk -f ${AWKPREFIX}/processonelog2.awk \
 			${log}/logs/${PKGNAME}.log \
 			2> /dev/null)
 	else