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

Consolidate bottle defaults and remove a method

Browse Source
This commit is contained in:
Jack Nagel 2014-03-05 10:24:33 -06:00
parent 7e45cbafca
commit 7e8c693218
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/bottles.rb
View File

@ -67,13 +67,8 @@ def bottle_regex
Pathname::BOTTLE_EXTNAME_RX Pathname::BOTTLE_EXTNAME_RX
end end
def bottle_root_url f
root_url = f.bottle.root_url
root_url ||= 'https://downloads.sf.net/project/machomebrew/Bottles'
end
def bottle_url f, tag=bottle_tag def bottle_url f, tag=bottle_tag
"#{bottle_root_url(f)}/#{bottle_filename(f, {:tag => tag})}" "#{f.bottle.root_url}/#{bottle_filename(f, :tag => tag)}"
end end
def bottle_tag def bottle_tag

2
Library/Homebrew/software_spec.rb
View File

@ -98,7 +98,7 @@ class Bottle < SoftwareSpec
@revision = 0 @revision = 0
@prefix = '/usr/local' @prefix = '/usr/local'
@cellar = '/usr/local/Cellar' @cellar = '/usr/local/Cellar'
@root_url = nil @root_url = 'https://downloads.sf.net/project/machomebrew/Bottles'
end end
# Checksum methods in the DSL's bottle block optionally take # Checksum methods in the DSL's bottle block optionally take