Merge pull request #6967 from sjackman/bottle-root-url

bottle: Elide root_url only if it is the default
2020-01-27 12:38:23 +00:00 · 2020-01-27 12:38:23 +00:00 · e47a6ac4cb
commit e47a6ac4cb
parent 31aaf48322 7f4c7e0afc
1 changed files with 1 additions and 1 deletions
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@ -11,7 +11,7 @@ require "erb"

 BOTTLE_ERB = <<-EOS
  bottle do
-    <% if  !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %>
+    <% if  root_url != "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}/bottles" %>
    root_url "<%= root_url %>"
    <% end  %>
    <% if  ![HOMEBREW_DEFAULT_PREFIX, LINUXBREW_DEFAULT_PREFIX].include?(prefix) %>