[HEADLESS] More permissive JDK check

Was very strict on the name format, but it can create some issues like for AlpineLinux which is used as based for GAMA Dockers ci release
gama-platform · May 5, 2022 · dad367d · dad367d
1 parent 059fdda
commit dad367d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ummisco.gama.product/extraresources/headless/osx/gama-headless.sh b/ummisco.gama.product/extraresources/headless/osx/gama-headless.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+javaVersion=$(java -version 2>&1 | head -n 1 | cut -d "\"" -f 2)
 # Check if good Java version before everything
-if [[ "$(java -version 2>&1 | head -n 1 | cut -d "\"" -f 2 | cut -d "." -f 1)" != "17" ]]; then
+if [[ ${javaVersion:2} == 17 ]]; then
   echo "You should use Java 17 to run GAMA"
+  echo "Found you using version : $javaVersion"
   exit 1
 fi
 

diff --git a/ummisco.gama.product/extraresources/headless/unix/gama-headless.sh b/ummisco.gama.product/extraresources/headless/unix/gama-headless.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+javaVersion=$(java -version 2>&1 | head -n 1 | cut -d "\"" -f 2)
 # Check if good Java version before everything
-if [[ "$(java -version 2>&1 | head -n 1 | cut -d "\"" -f 2 | cut -d "." -f 1)" != "17" ]]; then
+if [[ ${javaVersion:2} == 17 ]]; then
   echo "You should use Java 17 to run GAMA"
+  echo "Found you using version : $javaVersion"
   exit 1
 fi