From d99379bc631b060b6c6453b3b9babf3310a2c02b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 22 Jul 2014 19:11:09 -0500 Subject: [PATCH] Hide the downloader implementation from the installer --- Library/Homebrew/formula_installer.rb | 5 ++--- Library/Homebrew/software_spec.rb | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index bf49d45def..d1d991795f 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -634,9 +634,8 @@ class FormulaInstaller if f.local_bottle_path downloader = LocalBottleDownloadStrategy.new(f) else - bottle = f.bottle - downloader = bottle.downloader - bottle.verify_download_integrity(bottle.fetch) + downloader = f.bottle + downloader.verify_download_integrity(downloader.fetch) end HOMEBREW_CELLAR.cd do downloader.stage diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 7b8a09e46f..6a5efe3ee5 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -170,6 +170,10 @@ class Bottle cellar == :any || cellar == HOMEBREW_CELLAR.to_s end + def stage + resource.downloader.stage + end + private def build_url(root_url, filename)