Update various IAST scripts to clarify how to use them properly on

Windows.

Author: davewichers

tools/Contrast/runBenchmark_wContrast.bat

@@ -1,19 +1,21 @@
 @ECHO OFF
 IF EXIST .\contrast.jar (
   IF EXIST .\working (
-        DEL \F \Q .\working\contrast.log
+        DEL /F /Q .\working\contrast.log
 
-        RMDIR \S .\working\cache
-
-        ECHO ""
+        RMDIR /S /Q .\working\cache
 
+        ECHO.
         ECHO Previous Contrast results have been removed
-
-        ECHO ""
+        ECHO.
     )
 
     CD ..\..
 
+    ECHO After Crawl is Complete, hit Ctrl-C to stop Benchmark Tomcat instance.
+    ECHO When it asks "Terminate batch job (Y/N)?" Enter N, so script will complete and copy results to /results directory.
+    ECHO.
+
     CALL mvn clean package cargo:run -Pdeploywcontrast
 
     ECHO Copying Contrast reports to results directory

tools/CxIAST/runBenchmark_wCxIAST.bat

@@ -7,11 +7,9 @@ IF EXIST .\cx-launcher.jar (
         rmdir /q /s .\logs
       )
 
-      ECHO ""
-
+      ECHO.
       ECHO Previous Checkmarx IAST results have been removed
-
-      ECHO ""
+      ECHO.
   )
     CD ..\..
 

tools/HCL/runBenchmark_wHCL.bat

@@ -1,25 +1,28 @@
 @ECHO OFF
 IF EXIST .\secagent.jar (
   IF EXIST .\working (
-        DEL /F /Q .\working\*.*
 
-        RMDIR /S /Q .\working\cache
-
-        ECHO ""
+        RMDIR /S /Q .\working
 
+        ECHO.
         ECHO Previous results have been removed
-
-        ECHO ""
+        ECHO.
     )
 
     CD ..\..
 
+    ECHO After Crawl is Complete, hit Ctrl-C to stop Benchmark Tomcat instance.
+    ECHO When it asks "Terminate batch job (Y/N)?" Enter N, so script will complete and copy results to /results directory.
+    ECHO.
+
     CALL mvn clean package cargo:run -Pdeploywhcl
 
-    ECHO Copying reports to results directory
+    ECHO Copying HCL reports to results directory
 
-    COPY tools\HCL\working\HCL-IAST.hcl results\HCL-IAST.hcl
+    COPY tools\HCL\working\HCL-IAST.hcl results\Benchmark_HCL-IAST.hcl
 
     CD tools\HCL
 
-) 
+) ELSE (
+    ECHO HCL is a commercial product, so you need a licensed version of HCL in order to run it on the Benchmark. If you have access to HCL, download the HCL Agent for Java ^(secagent.jar^), put it into the /tools/HCL folder, and then rerun this script. Please contact HCL at https://www.hcl.com/.
+)

tools/HCL/runBenchmark_wHCL.sh

@@ -15,7 +15,7 @@ if [ -f ./secagent.jar ]; then
   mvn clean package cargo:run -Pdeploywhcl
 
   echo "Copying report to results directory"
-  cp tools/HCL/working/HCL-IAST.hcl results/HCL-IAST.hcl
+  cp tools/HCL/working/HCL-IAST.hcl results/Benchmark_HCL-IAST.hcl
   cd tools/HCL
 
 else