admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
Elide default root_url in the bottle block
This commit is contained in:
Mike McQuaid 2018-09-13 14:29:45 +01:00 committed by GitHub
commit f3ea2a85da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -41,7 +41,7 @@ require "erb"
BOTTLE_ERB = <<-EOS.freeze BOTTLE_ERB = <<-EOS.freeze
bottle do 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 %>" root_url "<%= root_url %>"
<% end %> <% end %>
<% if ![Homebrew::DEFAULT_PREFIX, "/usr/local"].include?(prefix) %> <% if ![Homebrew::DEFAULT_PREFIX, "/usr/local"].include?(prefix) %>