Skip to content

Honor $JAVA_HOME in require_java #2523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eregon merged 2 commits into from
Apr 18, 2025
Merged

Honor $JAVA_HOME in require_java #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c195f0
Honor `$JAVA_HOME` in `require_java`
ntkme Apr 18, 2025
525d599
Fix test
ntkme Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bin/ruby-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,11 @@ after_install_package() {
require_java() {
local required="$1"
local java_version version_string
java_version="$(java -version 2>&1 || true)"
if [ -n "$JAVA_HOME" ]; then
java_version="$("$JAVA_HOME/bin/java" -version 2>&1 || true)"
else
java_version="$(java -version 2>&1 || true)"
fi
version_string="$(grep 'java version' <<<"$java_version" | head -1 | grep -o '[0-9.]\+' | head -1 || true)"
[ -n "$version_string" ] || version_string="$(grep 'openjdk version' <<<"$java_version" | head -1 | grep -o '[0-9.]\+' | head -1 || true)"
IFS="."
Expand Down
1 change: 1 addition & 0 deletions test/test_helper.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export TMP="$BATS_TMPDIR"/ruby-build-test
export RUBY_BUILD_CURL_OPTS=
export RUBY_BUILD_HTTP_CLIENT="curl"
unset JAVA_HOME

if [ "$FIXTURE_ROOT" != "$BATS_TEST_DIRNAME/fixtures" ]; then
export FIXTURE_ROOT="$BATS_TEST_DIRNAME/fixtures"
Expand Down