From 4443a875243cabb0afaa862c846816b9e50fe60c Mon Sep 17 00:00:00 2001
From: Xu Cheng <xucheng@me.com>
Date: Fri, 3 Jul 2015 21:42:09 +0800
Subject: [PATCH] stop setting root_url for offical taps' bottles

---
 Library/Homebrew/cmd/bottle.rb   | 2 +-
 Library/Homebrew/cmd/test-bot.rb | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 6d721b1aaa..89e1f4f03a 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -9,7 +9,7 @@ require 'extend/pathname'
 
 BOTTLE_ERB = <<-EOS
   bottle do
-    <% if root_url != BottleSpecification::DEFAULT_ROOT_URL %>
+    <% if !root_url.start_with?(BottleSpecification::DEFAULT_DOMAIN) %>
     root_url "<%= root_url %>"
     <% end %>
     <% if prefix != BottleSpecification::DEFAULT_PREFIX %>
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index e03a0191f0..64b14efa34 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -486,9 +486,6 @@ module Homebrew
       if install_passed
         if formula.stable? && !ARGV.include?('--no-bottle')
           bottle_args = ["--rb", canonical_formula_name]
-          if @tap
-            bottle_args << "--root-url=#{BottleSpecification::DEFAULT_DOMAIN}/#{Bintray.repository(@tap)}"
-          end
           bottle_args << { :puts_output_on_success => true }
           test "brew", "bottle", *bottle_args
           bottle_step = steps.last