Skip to content

Commit e90abc4

Browse files
ntkmeeregon
authored andcommitted
Honor $JAVA_HOME in require_java
1 parent e1393ba commit e90abc4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

bin/ruby-build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,11 @@ after_install_package() {
970970
require_java() {
971971
local required="$1"
972972
local java_version version_string
973-
java_version="$(java -version 2>&1 || true)"
973+
if [ -n "$JAVA_HOME" ]; then
974+
java_version="$("$JAVA_HOME/bin/java" -version 2>&1 || true)"
975+
else
976+
java_version="$(java -version 2>&1 || true)"
977+
fi
974978
version_string="$(grep 'java version' <<<"$java_version" | head -1 | grep -o '[0-9.]\+' | head -1 || true)"
975979
[ -n "$version_string" ] || version_string="$(grep 'openjdk version' <<<"$java_version" | head -1 | grep -o '[0-9.]\+' | head -1 || true)"
976980
IFS="."

0 commit comments

Comments
 (0)