Merge pull request #4890 from sjackman/elide-root-url

Elide default root_url in the bottle block
2018-09-13 14:29:45 +01:00 · 2018-09-13 14:29:45 +01:00 · f3ea2a85da
commit f3ea2a85da
parent 9a9f9c3e1c e4f4e0f98b
1 changed files with 1 additions and 1 deletions
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@ -41,7 +41,7 @@ require "erb"

 BOTTLE_ERB = <<-EOS.freeze
  bottle do
-    <% if  !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %>
+    <% if  !["#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}/bottles", "https://homebrew.bintray.com/bottles"].include?(root_url) %>
    root_url "<%= root_url %>"
    <% end  %>
    <% if  ![Homebrew::DEFAULT_PREFIX, "/usr/local"].include?(prefix) %>