From 8e7316ee99d1b0a04d6aa397b3456cd234bac27e Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Sun, 27 Jun 2021 15:43:04 -0400
Subject: [PATCH] Much better way to get the Java for the server

---
 .../ca/gosyer/data/server/ServerService.kt    | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/ca/gosyer/data/server/ServerService.kt b/src/main/kotlin/ca/gosyer/data/server/ServerService.kt
index 4694a5f9..93d7d441 100644
--- a/src/main/kotlin/ca/gosyer/data/server/ServerService.kt
+++ b/src/main/kotlin/ca/gosyer/data/server/ServerService.kt
@@ -51,6 +51,36 @@ class ServerService @Inject constructor(
         }?.let { true } ?: false
     }
 
+    private fun getJavaFromPath(javaPath: File): String? {
+        val javaExeFile = File(javaPath, "java.exe")
+        val javaUnixFile = File(javaPath, "java")
+        return when {
+            javaExeFile.exists() -> '"' + javaExeFile.absolutePath + '"'
+            javaUnixFile.exists() -> '"' + javaUnixFile.absolutePath + '"'
+            else -> null
+        }
+    }
+
+    private fun getRuntimeJava(): String? {
+        return System.getProperty("java.home")?.let { getJavaFromPath(File(it, "bin")) }
+    }
+
+    private fun getPossibleJava(): String? {
+        return System.getProperty("java.library.path")?.split(File.pathSeparatorChar)
+            .orEmpty()
+            .asSequence()
+            .mapNotNull {
+                val file = File(it)
+                if (file.absolutePath.contains("java") || file.absolutePath.contains("jdk")) {
+                    if (file.name.equals("bin", true)) {
+                        file
+                    } else File(file, "bin")
+                } else null
+            }
+            .mapNotNull { getJavaFromPath(it) }
+            .firstOrNull()
+    }
+
     init {
         runtime.addShutdownHook(
             thread(start = false) {
@@ -67,7 +97,6 @@ class ServerService @Inject constructor(
                 return@onEach
             }
             GlobalScope.launch {
-
                 val jarFile = File(userDataDir, "Tachidesk.jar")
                 if (!jarFile.exists()) {
                     info { "Copying server to resources" }
@@ -93,15 +122,7 @@ class ServerService @Inject constructor(
                     }
                 }
 
-                val javaLibraryPath = System.getProperty("java.library.path").substringBefore(File.pathSeparator)
-                val javaExeFile = File(javaLibraryPath, "java.exe")
-                val javaUnixFile = File(javaLibraryPath, "java")
-                val javaExePath = when {
-                    javaExeFile.exists() -> '"' + javaExeFile.absolutePath + '"'
-                    javaUnixFile.exists() -> '"' + javaUnixFile.absolutePath + '"'
-                    else -> "java"
-                }
-
+                val javaExePath = getRuntimeJava() ?: getPossibleJava() ?: "java"
                 info { "Starting server with $javaExePath" }
                 val reader: BufferedReader
                 process = runtime.exec("""$javaExePath -jar "${jarFile.absolutePath}"""").also {