admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3333 from DomT4/java_versioning

Browse Source 
java_requirement: fix Java 9 version detection
This commit is contained in:
Mike McQuaid 2017-10-18 10:03:39 +01:00 committed by GitHub
commit a5c8628ffb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/requirements/java_requirement.rb
View File

@ -11,7 +11,7 @@ class JavaRequirement < Requirement
end end
def initialize(tags) def initialize(tags)
@version = tags.shift if /(\d\.)+\d/ =~ tags.first @version = tags.shift if /(\d+\.)+\d/ =~ tags.first
super super
end end
@ -103,7 +103,7 @@ class JavaRequirement < Requirement
end end
def satisfies_version(java) 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 return false unless java_version_s
java_version = Version.create(java_version_s) java_version = Version.create(java_version_s)
needed_version = Version.create(version_without_plus) needed_version = Version.create(version_without_plus)