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

Merge pull request #9310 from iMichka/cellar

Browse Source 
bottle merge: add support for linux cellar
This commit is contained in:
Michka Popoff 2020-11-26 23:31:28 +01:00 committed by GitHub
commit d42e8c7842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,9 @@ BOTTLE_ERB = <<-EOS
<% end %> <% end %>
<% if cellar.is_a? Symbol %> <% if cellar.is_a? Symbol %>
cellar :<%= cellar %> cellar :<%= cellar %>
<% elsif ![Homebrew::DEFAULT_CELLAR, "/usr/local/Cellar"].include?(cellar) %> <% elsif ![Homebrew::DEFAULT_MACOS_CELLAR,
Homebrew::DEFAULT_MACOS_ARM_CELLAR,
Homebrew::DEFAULT_LINUX_CELLAR].include?(cellar) %>
cellar "<%= cellar %>" cellar "<%= cellar %>"
<% end %> <% end %>
<% if rebuild.positive? %> <% if rebuild.positive? %>

3
Library/Homebrew/global.rb
View File

@ -80,6 +80,9 @@ module Homebrew
DEFAULT_PREFIX ||= HOMEBREW_DEFAULT_PREFIX DEFAULT_PREFIX ||= HOMEBREW_DEFAULT_PREFIX
DEFAULT_CELLAR = "#{DEFAULT_PREFIX}/Cellar" DEFAULT_CELLAR = "#{DEFAULT_PREFIX}/Cellar"
DEFAULT_MACOS_CELLAR = "#{HOMEBREW_DEFAULT_PREFIX}/Cellar"
DEFAULT_MACOS_ARM_CELLAR = "#{HOMEBREW_MACOS_ARM_DEFAULT_PREFIX}/Cellar"
DEFAULT_LINUX_CELLAR = "#{HOMEBREW_LINUX_DEFAULT_PREFIX}/Cellar"
DEFAULT_REPOSITORY = "#{DEFAULT_PREFIX}/Homebrew" DEFAULT_REPOSITORY = "#{DEFAULT_PREFIX}/Homebrew"
class << self class << self