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

Hide the downloader implementation from the installer

Browse Source
This commit is contained in:
Jack Nagel 2014-07-22 19:11:09 -05:00
parent 2b1b7ef0e4
commit d99379bc63
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/formula_installer.rb
View File

@ -634,9 +634,8 @@ class FormulaInstaller
if f.local_bottle_path if f.local_bottle_path
downloader = LocalBottleDownloadStrategy.new(f) downloader = LocalBottleDownloadStrategy.new(f)
else else
bottle = f.bottle downloader = f.bottle
downloader = bottle.downloader downloader.verify_download_integrity(downloader.fetch)
bottle.verify_download_integrity(bottle.fetch)
end end
HOMEBREW_CELLAR.cd do HOMEBREW_CELLAR.cd do
downloader.stage downloader.stage

4
Library/Homebrew/software_spec.rb
View File

@ -170,6 +170,10 @@ class Bottle
cellar == :any || cellar == HOMEBREW_CELLAR.to_s cellar == :any || cellar == HOMEBREW_CELLAR.to_s
end end
def stage
resource.downloader.stage
end
private private
def build_url(root_url, filename) def build_url(root_url, filename)