Skip to content

Commit

Permalink
fix: Also respect linux and mac java location
Browse files Browse the repository at this point in the history
  • Loading branch information
ci010 committed Mar 29, 2024
1 parent 525ffcd commit 5800e6c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
6 changes: 5 additions & 1 deletion xmcl-runtime/java/JavaService.ts
Expand Up @@ -16,7 +16,7 @@ import { readdirIfPresent } from '../util/fs'
import { requireString } from '../util/object'
import { SafeFile, createSafeFile } from '../util/persistance'
import { ensureClass, getJavaArch } from './detectJVMArch'
import { getMojangJavaPaths, getOpenJdkPaths, getOrcaleJavaPaths } from './javaPaths'
import { getJavaPathsLinux, getJavaPathsOSX, getMojangJavaPaths, getOpenJdkPaths, getOrcaleJavaPaths } from './javaPaths'

@ExposeServiceKey(JavaServiceKey)
export class JavaService extends StatefulService<JavaState> implements IJavaService {
Expand Down Expand Up @@ -210,6 +210,10 @@ export class JavaService extends StatefulService<JavaState> implements IJavaServ
...await getOrcaleJavaPaths(),
...await getOpenJdkPaths(),
)
} else if (this.app.platform.os === 'linux') {
commonLocations.push(...await getJavaPathsLinux())
} else if (this.app.platform.os === 'osx') {
commonLocations.push(...await getJavaPathsOSX())
}
const javas = await scanLocalJava(commonLocations)
const infos = await Promise.all(javas.map(async (j) => ({ ...j, valid: true, arch: await getJavaArch(this, j.path) })))
Expand Down
10 changes: 10 additions & 0 deletions xmcl-runtime/java/javaPaths.ts
Expand Up @@ -19,3 +19,13 @@ export async function getOpenJdkPaths() {
const files = await readdir('C:\\Program Files\\AdoptOpenJDK').catch(() => [])
return files.map(f => join('C:\\Program Files\\AdoptOpenJDK', f, 'bin', 'java.exe'))
}

export async function getJavaPathsLinux() {
const files = await readdir('/usr/lib/jvm').catch(() => [])
return files.map(f => join('/usr/lib/jvm', 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'))
}

0 comments on commit 5800e6c

Please sign in to comment.