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

java_requirement: fix detection of new Java versioning scheme

Browse Source 
Closes https://github.com/Homebrew/brew/issues/3331.
This commit is contained in:
Dominyk Tiller 2017-10-18 02:25:34 +01:00
parent cf349018d5
commit 19790679bc
No known key found for this signature in database
GPG Key ID: FE19AEFCF658C6F6
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)