enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-26 17:06:48 +03:00
Code Issues Projects Releases Wiki Activity

On MacOS, do not assume existence of Contents/Home in the JDK binary path (#9684)

Browse Source
This commit is contained in:
GregoryTravis 2024-04-15 16:07:25 -04:00 committed by GitHub
parent 9d2d9038c9
commit 271a744b67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/GraalRuntime.scala
View File

@ -31,10 +31,20 @@ case class GraalRuntime(version: GraalVMVersion, path: Path) {
def javaHome: Path =
OS.operatingSystem match {
case OS.Linux => path
case OS.MacOS => path / "Contents" / "Home"
case OS.MacOS => findMacOSJavaPath()
case OS.Windows => path
}
/** The bin/ directory may or may not be inside Contents/Home, so check both
* possibilities.
*/
def findMacOSJavaPath(): Path = {
val contentsHomePath = path / "Contents" / "Home"
if (Files.exists(contentsHomePath))
contentsHomePath
else path
}
/** The path to the `java` executable associated with this runtime. */
def javaExecutable: Path = {
val executableName = if (OS.isWindows) "java.exe" else "java"