Merge branch 'develop' into 'main'

Develop See merge request Griefed/ServerPackCreator!600
Griefed · Aug 11, 2024 · ada73b3 · ada73b3
2 parents 6ca78d5 + f8aef38
commit ada73b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...packcreator-api/src/main/resources/de/griefed/resources/server_files/default_template.ps1 b/...packcreator-api/src/main/resources/de/griefed/resources/server_files/default_template.ps1
@@ -613,7 +613,14 @@ else
         else
         {
             GetJavaVersion
-            if ([int]$script:JavaVersion -ne [int]$RecommendedJavaVersion)
+            if ($script:JavaVersion -match '[0-9]+')
+            {
+                if ($script:JavaVersion -ne $RecommendedJavaVersion)
+                {
+                    InstallJava
+                }
+            }
+            else
             {
                 InstallJava
             }
@@ -623,7 +630,7 @@ else
     {
         GetJavaVersion
         Write-Host "Detected $($Semantics[0]).$($Semantics[1]).$($Semantics[2]) - Java $($JavaVersion)"
-        if ([int]$script:JavaVersion -ne [int]$RecommendedJavaVersion)
+        if ($script:JavaVersion -ne $RecommendedJavaVersion)
         {
             $script:Java = "java"
             InstallJava

diff --git a/...rpackcreator-api/src/main/resources/de/griefed/resources/server_files/default_template.sh b/...rpackcreator-api/src/main/resources/de/griefed/resources/server_files/default_template.sh
@@ -416,7 +416,11 @@ else
       installJava
     else
       getJavaVersion
-      if [[ "$JAVA_VERSION" != "$RECOMMENDED_JAVA_VERSION" ]];then
+      if [[ "$JAVA_VERSION" =~ [0-9]+ ]];then
+        if [[ "$JAVA_VERSION" != "$RECOMMENDED_JAVA_VERSION" ]];then
+          installJava
+        fi
+      else
         installJava
       fi
     fi