A few minor fixes to the other IAST run scripts.

Author: davewichers

tools/CxIAST/runBenchmark_wCxIAST.sh

@@ -19,7 +19,6 @@ if [ -f ./cx-launcher.jar ]; then
   fi
 
   cd ../..
-  chmod 755 target/classes/insecureCmd.sh
   mvn clean package cargo:run -Pdeploywcxiast
 
   echo "Download Checkmarx IAST report to results directory"

tools/HCL/runBenchmark_wHCL.sh

@@ -15,11 +15,14 @@ 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/Benchmark_HCL-IAST.hcl
+  benchmark_version=$(scripts/getBenchmarkVersion.sh)
+  result_file="results/Benchmark_$benchmark_version-HCL-IAST.hcl"
+  cp tools/HCL/working/HCL-IAST.hcl "$result_file"
   cd tools/HCL
 
 else 
 
-  echo "secagent.jar is required to run this benchmark. Please contact HCL at https://www.hcl.com/."
+  echo "secagent.jar is required to run the Benchmark with HCL IAST. Please contact HCL at https://www.hcl.com/."
 
 fi
+

tools/seeker/runBenchmark_wSeeker.sh

@@ -2,14 +2,7 @@
 
 if [ -f ./seeker-agent.jar ]; then
 
-    echo ""
-    echo "Previous Seeker results in tools/seeker removed"
-    echo ""
-
-  fi
-
   cd ../..
-  chmod 755 target/classes/insecureCmd.sh
   mvn clean package cargo:run -Pdeploywseeker
 
   echo "Download Seeker report to results directory"