From a3253e1c6beb535dc582a6352bb0b712796daf55 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Mon, 11 Aug 2025 08:11:25 +0200
Subject: [PATCH] Honor the JAVA_HOME and JDK_HOME environment variables in
 nbexec script

---
 platform/o.n.bootstrap/launcher/unix/nbexec | 24 +++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec
index 228b37cbe20d..7a9cb41ff24a 100755
--- a/platform/o.n.bootstrap/launcher/unix/nbexec
+++ b/platform/o.n.bootstrap/launcher/unix/nbexec
@@ -157,16 +157,22 @@ if [ -z "$jdkhome" ] ; then
                 jdkhome="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home"
             fi
             ;;
-            *) javac=`which javac`
-            if [ -z "$javac" ] ; then
-                java=`which java`
-                if [ ! -z "$java" ] ; then
-                    java=`resolve_symlink "$java"`
-                    jdkhome=`dirname $java`"/.."
-                fi
+            *)
+            if [ ! -z "${JAVA_HOME}" ]; then
+                jdkhome="${JAVA_HOME}"
             else
-                javac=`resolve_symlink "$javac"`
-                jdkhome=`dirname $javac`"/.."
+                # Doesn't work with jenv-style shims
+                javac=`which javac`
+                if [ -z "$javac" ] ; then
+                    java=`which java`
+                    if [ ! -z "$java" ] ; then
+                        java=`resolve_symlink "$java"`
+                        jdkhome=`dirname $java`"/.."
+                    fi
+                else
+                    javac=`resolve_symlink "$javac"`
+                    jdkhome=`dirname $javac`"/.."
+                fi
             fi
             ;;
         esac