refactor: Support for sdkman for Linux (#856)

Voxelum · Dec 9, 2024 · 4915ff4 · 4915ff4
1 parent 9c68c33
commit 4915ff4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/xmcl-runtime/java/JavaService.ts b/xmcl-runtime/java/JavaService.ts
@@ -15,7 +15,7 @@ import { readdirIfPresent } from '../util/fs'
 import { requireString } from '../util/object'
 import { SafeFile, createSafeFile } from '../util/persistance'
 import { ensureClass, getJavaArch } from './detectJVMArch'
-import { getJavaPathsLinux, getJavaPathsOSX, getMojangJavaPaths, getOpenJdkPaths, getOrcaleJavaPaths, getZuluJdkPath } from './javaPaths'
+import { getJavaPathsLinux, getJavaPathsLinuxSDK, getJavaPathsOSX, getMojangJavaPaths, getOpenJdkPaths, getOrcaleJavaPaths, getZuluJdkPath } from './javaPaths'
 
 @ExposeServiceKey(JavaServiceKey)
 export class JavaService extends StatefulService<JavaState> implements IJavaService {
@@ -301,6 +301,7 @@ export class JavaService extends StatefulService<JavaState> implements IJavaServ
         )
       } else if (this.app.platform.os === 'linux') {
         commonLocations.push(...await getJavaPathsLinux())
+        commonLocations.push(...await getJavaPathsLinuxSDK())
       } else if (this.app.platform.os === 'osx') {
         commonLocations.push(...await getJavaPathsOSX())
       }

diff --git a/xmcl-runtime/java/javaPaths.ts b/xmcl-runtime/java/javaPaths.ts
@@ -1,5 +1,6 @@
 import { lstat, readdir } from 'fs-extra'
 import { join } from 'path'
+import { homedir } from 'os'
 
 export async function getMojangJavaPaths() {
   const runtimeDir = 'C:\\Program Files (x86)\\Minecraft Launcher\\runtime'
@@ -30,6 +31,11 @@ export async function getJavaPathsLinux() {
   return files.map(f => join('/usr/lib/jvm', f, 'bin', 'java'))
 }
 
+export async function getJavaPathsLinuxSDK() {
+  const files = await readdir(`${homedir}/.sdkman/candidates/java`).catch(() => [])
+  return files.map(f => join(`${homedir}/.sdkman/candidates/java`, f, 'bin', 'java'))
+}
+
 export async function getJavaPathsOSX() {
   const files = await readdir('/Library/Java/JavaVirtualMachines').catch(() => [])
   return files.map(f => join('/Library/Java/JavaVirtualMachines', f, 'Contents', 'Home', 'bin', 'java'))