Skip to content

Find Java correctly when JAVA_TOOL_OPTIONS is set (fixes #523) #561

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

Open
iacsha wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −3
Open

Find Java correctly when JAVA_TOOL_OPTIONS is set (fixes #523) #561

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55951e2
Find Java correctly when JAVA_TOOL_OPTIONS is set (fixes #523)
iacsha Nov 6, 2026
182f4bd
Simplify version parse to a single anchored bash regex (review feedback)
iacsha Nov 6, 2026
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
10 changes: 7 additions & 3 deletions server/basedir-includes/oieserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,13 @@ is_valid_java_version() {
return 1
fi

# Extract the major version number. This works for formats like "1.8.0" and "17.0.2".
local major_version
major_version=$(echo "$version_output" | head -n 1 | cut -d '"' -f 2 | cut -d '.' -f 1)
# Extract the major version number by matching the quoted version string (e.g.
# openjdk version "17.0.2"). Matching 'version "' rather than scanning the whole
# output means a "Picked up JAVA_TOOL_OPTIONS:" banner - printed to stderr when
# JAVA_TOOL_OPTIONS or _JAVA_OPTIONS is set - or any other number in the output is
# not mistaken for the version. Works for both "1.8.0" and "17.0.2" formats. See #523.
local major_version=""
[[ "$version_output" =~ version\ \"([0-9]+) ]] && major_version="${BASH_REMATCH[1]}"

# Check if the extracted version is a number and meets the minimum requirement
if [[ "$major_version" =~ ^[0-9]+$ ]] && [[ "$major_version" -ge "$MIN_JAVA_VERSION" ]]; then
Expand Down
Loading