From 01561000133ac96d6722368f9fb5017beacb5837 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 28 May 2024 14:22:50 -0700
Subject: [PATCH] Execute cliargs script before running tests

---
 checkcliargs.sh                                  | 16 ----------------
 lib/bld/bld-wrapper.properties                   |  1 +
 scripts/checkcliargs.sh                          | 16 ++++++++++++++++
 cliargs.sh => scripts/cliargs.sh                 |  0
 .../rife/bld/extension/TestNgOperationBuild.java | 11 ++++++++++-
 5 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100755 checkcliargs.sh
 create mode 100755 scripts/checkcliargs.sh
 rename cliargs.sh => scripts/cliargs.sh (100%)

diff --git a/checkcliargs.sh b/checkcliargs.sh
deleted file mode 100755
index 77e8ec5..0000000
--- a/checkcliargs.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-MAIN="org.testng.TestNG"
-TMPNEW=/tmp/checkcliargs-new
-TMPOLD=/tmp/checkcliargs-old
-
-java -cp "lib/test/*" $MAIN >$TMPNEW
-java -cp "examples/lib/test/*" $MAIN >$TMPOLD
-
-if [ "$1" = "-v" ]; then
-	code --wait --diff $TMPOLD $TMPNEW
-else
-	diff $TMPOLD $TMPNEW
-fi
-
-rm -rf $TMPNEW $TMPOLD
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 56cd8a5..eb5f238 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,6 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.9
+bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.0
 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
diff --git a/scripts/checkcliargs.sh b/scripts/checkcliargs.sh
new file mode 100755
index 0000000..294a6c6
--- /dev/null
+++ b/scripts/checkcliargs.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+main="org.testng.TestNG"
+new=/tmp/checkcliargs-new
+old=/tmp/checkcliargs-old
+
+java -cp "lib/test/*" $main 2>/dev/null >$new
+java -cp "examples/lib/test/*" $main 2>/dev/null >$old
+
+if [ "$1" = "-v" ]; then
+	code --wait --diff $old $new
+else
+	diff $old $new
+fi
+
+rm -rf $new $old
diff --git a/cliargs.sh b/scripts/cliargs.sh
similarity index 100%
rename from cliargs.sh
rename to scripts/cliargs.sh
diff --git a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
index 75726bc..379ec59 100644
--- a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
@@ -37,7 +37,7 @@ public class TestNgOperationBuild extends Project {
         version = version(0, 9, 9, "SNAPSHOT");
 
         javaRelease = 17;
-        
+
         downloadSources = true;
         autoDownloadPurge = true;
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
@@ -101,4 +101,13 @@ public class TestNgOperationBuild extends Project {
                 .ruleSets("config/pmd.xml")
                 .execute();
     }
+
+    @Override
+    public void test() throws Exception {
+        new ExecOperation()
+                .fromProject(this)
+                .command("scripts/cliargs.sh")
+                .execute();
+        super.test();
+    }
 }