Generate the bottle download URL correctly.

Fixes Homebrew/homebrew#11561.
Fixes Homebrew/homebrew#11614.

1 files changed, 2 insertions, 1 deletions

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index cecb904ab..d0e270137 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -61,6 +61,8 @@ class Formula
     CHECKSUM_TYPES.each { |type| set_instance_variable type }
 
     @downloader = download_strategy.new @spec_to_use.url, name, version, @spec_to_use.specs
+
+    @bottle_url ||= bottle_base_url + bottle_filename(self) if @bottle_sha1
   end
 
   # if the dir is there, but it's empty we consider it not installed
@@ -632,7 +634,6 @@ private
 
       bottle_block.instance_eval &block
       @bottle_version, @bottle_url, @bottle_sha1 = bottle_block.data
-      @bottle_url ||= bottle_base_url + bottle_filename(self) if @bottle_sha1
     end
 
     def mirror val, specs=nil