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

Inline method so we don't merge and unpack options twice

Browse Source
This commit is contained in:
Jack Nagel 2014-07-13 19:29:36 -05:00
parent 0323226256
commit 644904736e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/bottles.rb
View File

@ -5,7 +5,8 @@ require 'bottle_version'
def bottle_filename options={} def bottle_filename options={}
options = { :tag => bottle_tag }.merge(options) options = { :tag => bottle_tag }.merge(options)
"#{options[:name]}-#{options[:version]}#{bottle_native_suffix(options)}" suffix = ".#{options[:tag]}#{bottle_suffix(options[:revision])}"
"#{options[:name]}-#{options[:version]}#{suffix}"
end end
def built_as_bottle? f def built_as_bottle? f
@ -24,11 +25,6 @@ def bottle_file_outdated? f, file
bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext
end end
def bottle_native_suffix options={}
options = { :tag => bottle_tag }.merge(options)
".#{options[:tag]}#{bottle_suffix(options[:revision])}"
end
def bottle_suffix revision=nil def bottle_suffix revision=nil
revision = revision.to_i > 0 ? ".#{revision}" : "" revision = revision.to_i > 0 ? ".#{revision}" : ""
".bottle#{revision}.tar.gz" ".bottle#{revision}.tar.gz"