Set bottle download strategy directly

We know what strategy we want, so going through DownloadStrategyDetector
is wasted work. Now we can remove those patterns from the detector and
have two fewer branches each time through.

4 files changed, 1 insertions, 4 deletions

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index e3caa07f7..479365c98 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -828,8 +828,6 @@ class DownloadStrategyDetector
       SubversionDownloadStrategy
     when %r[^https?://(.+?\.)?sourceforge\.net/hgweb/]
       MercurialDownloadStrategy
-    when bottle_native_regex, bottle_regex
-      CurlBottleDownloadStrategy
     else
       CurlDownloadStrategy
     end
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 1cdfa2e0d..e835bf56d 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -131,6 +131,7 @@ class Bottle
       :revision => spec.revision,
       :tag => spec.current_tag
     )
+    @resource.download_strategy = CurlBottleDownloadStrategy
     @resource.version = f.pkg_version
     @resource.checksum = spec.checksum
     @prefix = spec.prefix
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index 6ecfb54f7..8e44cc532 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -1,6 +1,5 @@
 require 'testing_env'
 require 'download_strategy'
-require 'bottles' # XXX: hoist these regexps into constants in Pathname?
 
 class ResourceDouble
   attr_reader :url, :specs
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index 7c9fb8720..f4a63e244 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -1,6 +1,5 @@
 require 'testing_env'
 require 'software_spec'
-require 'bottles'
 
 class SoftwareSpecTests < Test::Unit::TestCase
   include VersionAssertions