From 17076d29eb368c1923d495be9991d4540ea2cfda Mon Sep 17 00:00:00 2001 From: James Johnston Date: Thu, 17 Aug 2023 13:19:35 +0100 Subject: [PATCH 1/2] Allow use of "java_home" env var to specify the java runtime if configured --- src/J2NET/Utilities/PathUtility.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/J2NET/Utilities/PathUtility.cs b/src/J2NET/Utilities/PathUtility.cs index 2ff07e9..0198e89 100644 --- a/src/J2NET/Utilities/PathUtility.cs +++ b/src/J2NET/Utilities/PathUtility.cs @@ -8,6 +8,13 @@ public static class PathUtility { public static string GetRuntimePath() { + string javaHome = Environment.GetEnvironmentVariable("java_home"); + + if (javaHome != null) + { + return Path.Combine(javaHome, "bin", "java"); + } + var directory = Path.GetDirectoryName(typeof(PathUtility).Assembly.Location) ?? throw new DirectoryNotFoundException(); var runtimeIdentifier = GetRuntimeIdentifier(); return Path.Combine(directory, "runtimes", runtimeIdentifier, "openjre", "bin", "java"); From 49b583248cae9582d1092cc6de9bccdc9cb00ea3 Mon Sep 17 00:00:00 2001 From: James Johnston Date: Thu, 7 Sep 2023 11:28:35 +0100 Subject: [PATCH 2/2] Update PathUtility.cs --- src/J2NET/Utilities/PathUtility.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/J2NET/Utilities/PathUtility.cs b/src/J2NET/Utilities/PathUtility.cs index 0198e89..6bae6cd 100644 --- a/src/J2NET/Utilities/PathUtility.cs +++ b/src/J2NET/Utilities/PathUtility.cs @@ -8,7 +8,7 @@ public static class PathUtility { public static string GetRuntimePath() { - string javaHome = Environment.GetEnvironmentVariable("java_home"); + string javaHome = Environment.GetEnvironmentVariable("JAVA_HOME"); if (javaHome != null) {