From e854909592d6da8cf5fde820a153c8bd0c25f517 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 15 Dec 2024 14:59:02 -0500 Subject: [PATCH] Use JAVA_HOME when available --- .../util-core/src/main/scala/sbt/internal/util/Util.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/util-core/src/main/scala/sbt/internal/util/Util.scala b/internal/util-core/src/main/scala/sbt/internal/util/Util.scala index 85952ec7d..76647737b 100644 --- a/internal/util-core/src/main/scala/sbt/internal/util/Util.scala +++ b/internal/util-core/src/main/scala/sbt/internal/util/Util.scala @@ -81,6 +81,9 @@ object Util: } lazy val javaHome: Path = - if sys.props("java.home").endsWith("jre") then Paths.get(sys.props("java.home")).getParent() - else Paths.get(sys.props("java.home")) + sys.env.get("JAVA_HOME") match + case Some(home) => Paths.get(home) + case None => + if sys.props("java.home").endsWith("jre") then Paths.get(sys.props("java.home")).getParent() + else Paths.get(sys.props("java.home")) end Util