This commit is contained in:
+30
-8
@@ -233,14 +233,8 @@ java_arch_matches_host() {
|
||||
esac
|
||||
}
|
||||
|
||||
system_java_home() {
|
||||
local java_bin resolved_java java_major home
|
||||
if [ -n "${KAIDI_JAVA_HOME:-}" ]; then
|
||||
home=${KAIDI_JAVA_HOME%/}
|
||||
java_bin="$home/bin/java"
|
||||
else
|
||||
java_bin=$(command -v java 2>/dev/null || true)
|
||||
fi
|
||||
java_home_from_bin() {
|
||||
local java_bin=$1 resolved_java java_major home
|
||||
[ -x "$java_bin" ] || return 1
|
||||
java_major=$(
|
||||
"$java_bin" -version 2>&1 \
|
||||
@@ -258,6 +252,34 @@ system_java_home() {
|
||||
printf '%s\n' "$home"
|
||||
}
|
||||
|
||||
system_java_home() {
|
||||
local candidate home
|
||||
if [ -n "${KAIDI_JAVA_HOME:-}" ]; then
|
||||
candidate="${KAIDI_JAVA_HOME%/}/bin/java"
|
||||
java_home_from_bin "$candidate" && return 0
|
||||
return 1
|
||||
fi
|
||||
candidate=$(command -v java 2>/dev/null || true)
|
||||
if [ -n "$candidate" ] && home=$(java_home_from_bin "$candidate"); then
|
||||
printf '%s\n' "$home"
|
||||
return 0
|
||||
fi
|
||||
# Baota commonly keeps JDKs outside PATH. Prefer an existing Java 17 there
|
||||
# before consulting the remote Azul metadata endpoint.
|
||||
for candidate in \
|
||||
/www/server/java/*/bin/java \
|
||||
/www/server/java/*/jre/bin/java \
|
||||
/usr/lib/jvm/*/bin/java \
|
||||
/usr/java/*/bin/java; do
|
||||
[ -x "$candidate" ] || continue
|
||||
if home=$(java_home_from_bin "$candidate"); then
|
||||
printf '%s\n' "$home"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
prepare_java() {
|
||||
local api java_metadata package_metadata package_uuid java_url java_sha256 actual_sha256 system_home java_line
|
||||
if system_home=$(system_java_home); then
|
||||
|
||||
Reference in New Issue
Block a user