Don't use underscores in (new) bottle filenames.

Closes Homebrew/homebrew#14270

1 files changed, 9 insertions, 1 deletions

diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb
index 6e231e7e3..0a5a62bb7 100644
--- a/Library/Homebrew/formula_support.rb
+++ b/Library/Homebrew/formula_support.rb
@@ -81,10 +81,13 @@ end
 class Bottle < SoftwareSpec
   attr_writer :url
   attr_reader :revision
+  # TODO: Can be removed when all bottles migrated to underscored cat symbols.
+  attr_reader :cat_without_underscores
 
   def initialize url=nil, version=nil
     super
     @revision = 0
+    @cat_without_underscores = false
   end
 
   # Checksum methods in the DSL's bottle block optionally take
@@ -103,7 +106,12 @@ class Bottle < SoftwareSpec
           @#{cksum}[value] = Checksum.new(:#{cksum}, key)
         end
 
-        @checksum = @#{cksum}[MacOS.cat] if @#{cksum}.has_key? MacOS.cat
+        if @#{cksum}.has_key? MacOS.cat
+          @checksum = @#{cksum}[MacOS.cat]
+        elsif @#{cksum}.has_key? MacOS.cat_without_underscores
+          @checksum = @#{cksum}[MacOS.cat_without_underscores]
+          @cat_without_underscores = true
+        end
       end
     }
   end