From 30d3468ee1bc18177e4f9996835feddc20d0a2ca Mon Sep 17 00:00:00 2001
From: lfq1234 <95916049+lfq1234@users.noreply.github.com>
Date: Sat, 7 Jun 2025 17:50:41 +0800
Subject: [PATCH] Update runbroker-customize.sh

The current `find_java_home` function may not correctly locate `JAVA_HOME` in certain scenarios. It would be beneficial to add more checks and prompts to enhance its functionality.
---
 image-build-ci/scripts/runbroker-customize.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/image-build-ci/scripts/runbroker-customize.sh b/image-build-ci/scripts/runbroker-customize.sh
index 553875d..ec13990 100755
--- a/image-build-ci/scripts/runbroker-customize.sh
+++ b/image-build-ci/scripts/runbroker-customize.sh
@@ -26,14 +26,25 @@ error_exit ()
 
 find_java_home()
 {
+    if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
+        echo "Using JAVA_HOME from environment: $JAVA_HOME"
+        return
+    fi
+
     case "`uname`" in
         Darwin)
             JAVA_HOME=$(/usr/libexec/java_home)
-        ;;
+            ;;
         *)
             JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
-        ;;
+            ;;
     esac
+
+    if [ ! -x "$JAVA_HOME/bin/java" ]; then
+        error_exit "Java executable not found. Please set JAVA_HOME."
+    fi
+
+    echo "Found JAVA_HOME: $JAVA_HOME"
 }
 
 find_java_home