aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/bottles.rb7
-rw-r--r--Library/Homebrew/software_spec.rb2
2 files changed, 2 insertions, 7 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 2888a09c4..b1638286a 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 1cd193327..fa727d093 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