BottleLoader: use bottle_resolve_formula_names

1 files changed, 2 insertions, 11 deletions

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 65ab0b68f..5e55543d0 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -69,17 +69,8 @@ class Formulary
   class BottleLoader < FormulaLoader
     def initialize bottle_name
       @bottle_filename = Pathname(bottle_name).realpath
-      name_without_version = bottle_filename_formula_name @bottle_filename
-      if name_without_version.empty?
-        if ARGV.homebrew_developer?
-          opoo "Add a new regex to bottle_version.rb to parse this filename."
-        end
-        name = bottle_name
-      else
-        name = name_without_version
-      end
-
-      super name, Formulary.path(name)
+      name, full_name = bottle_resolve_formula_names @bottle_filename
+      super name, Formulary.path(full_name)
     end
 
     def get_formula(spec)