From 7e8c693218499811897ebc502aa2cac5c7ab59cc Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 5 Mar 2014 10:24:33 -0600 Subject: [PATCH] Consolidate bottle defaults and remove a method --- Library/Homebrew/bottles.rb | 7 +------ Library/Homebrew/software_spec.rb | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index 2888a09c49..b1638286a4 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -67,13 +67,8 @@ def bottle_regex Pathname::BOTTLE_EXTNAME_RX 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 - "#{bottle_root_url(f)}/#{bottle_filename(f, {:tag => tag})}" + "#{f.bottle.root_url}/#{bottle_filename(f, :tag => tag)}" end def bottle_tag diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 1cd1933272..fa727d0931 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -98,7 +98,7 @@ class Bottle < SoftwareSpec @revision = 0 @prefix = '/usr/local' @cellar = '/usr/local/Cellar' - @root_url = nil + @root_url = 'https://downloads.sf.net/project/machomebrew/Bottles' end # Checksum methods in the DSL's bottle block optionally take