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

Revert "Elide default root_url in the bottle block"

Browse Source 
This reverts commit e4f4e0f98b6ff9c0f9f988345c2257fbc151e8b0.

This is no longer necessary as `HOMEBREW_FORCE_HOMEBREW_ON_LINUX`
is set when uploading bottles for Homebrew.
This commit is contained in:
Cheng Xu 2019-05-17 17:24:44 +08:00
parent 2e5fbf57af
commit 6437a70a5f
No known key found for this signature in database
GPG Key ID: B19F15830AB4E690
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

@ -13,7 +13,7 @@ require "erb"
BOTTLE_ERB = <<-EOS.freeze BOTTLE_ERB = <<-EOS.freeze
bottle do bottle do
<% if !["#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}/bottles", "https://homebrew.bintray.com/bottles"].include?(root_url) %> <% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %>
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) %>