Merge pull request #796 from douglasgscofield/master

within set_JAVA_PATH, generalize check for java version and prevent substitutions within awk command
Gaius-Augustus · May 10, 2024 · 3f1f9b4 · 3f1f9b4
2 parents b8cd99e + bcb54fb
commit 3f1f9b4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/braker.pl b/scripts/braker.pl
@@ -2341,7 +2341,7 @@ sub set_JAVA_PATH {
     $JAVA_PATH = set_software_PATH($java_path, "JAVA_PATH",
                     \@required_files, 'exit');
 
-    $cmdString = "java -version 2>&1 | grep 'openjdk version' | awk -F['\"''.'] -v OFS=. '{print $2,$3}'";
+    $cmdString = "java -version 2>&1 | grep 'version' | awk -F['\"''.'] -v OFS=. ".'\'{print $2,$3}\'';
     my @javav = `$cmdString` or die("Failed to execute: $cmdString");
     if(not ($javav[0] =~ m/1\.8/ )){
         $prtStr = "\# " . (localtime) . " ERROR: in file " . __FILE__