Skip to content
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

Jump to bottom

java_requirement: fix Java 9 version detection #3333

Merged
merged 1 commit into from
Oct 18, 2017
Merged

java_requirement: fix Java 9 version detection #3333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Library/Homebrew/requirements/java_requirement.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class JavaRequirement < Requirement
end

def initialize(tags)
@version = tags.shift if /(\d\.)+\d/ =~ tags.first
@version = tags.shift if /(\d+\.)+\d/ =~ tags.first
super
end

Expand Down Expand Up @@ -103,7 +103,7 @@ def oracle_java_os
end

def satisfies_version(java)
java_version_s = Utils.popen_read("#{java} -version 2>&1")[/1.\d/]
java_version_s = Utils.popen_read("#{java} -version 2>&1")[/\d+.\d/]
return false unless java_version_s
java_version = Version.create(java_version_s)
needed_version = Version.create(version_without_plus)
Expand Down