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

define default prefix constants

Browse Source 
also use them to detect if prefix line in bottle block is needed
This commit is contained in:
Dawid Dziurla 2019-09-30 16:09:03 +02:00
parent e37d1d4622
commit 8ff7601a92
No known key found for this signature in database
GPG Key ID: 7B6D8368172E9B0B
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ BOTTLE_ERB = <<-EOS.freeze
<% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %> <% 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, LINUXBREW_DEFAULT_PREFIX].include?(prefix) %>
prefix "<%= prefix %>" prefix "<%= prefix %>"
<% end %> <% end %>
<% if cellar.is_a? Symbol %> <% if cellar.is_a? Symbol %>

5
Library/Homebrew/global.rb
View File

@ -52,6 +52,9 @@ HOMEBREW_USER_AGENT_FAKE_SAFARI =
HOMEBREW_BOTTLE_DEFAULT_DOMAIN = ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] HOMEBREW_BOTTLE_DEFAULT_DOMAIN = ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"]
HOMEBREW_BOTTLE_DOMAIN = ENV["HOMEBREW_BOTTLE_DOMAIN"] HOMEBREW_BOTTLE_DOMAIN = ENV["HOMEBREW_BOTTLE_DOMAIN"]
HOMEBREW_DEFAULT_PREFIX = "/usr/local"
LINUXBREW_DEFAULT_PREFIX = "/home/linuxbrew/.linuxbrew"
require "fileutils" require "fileutils"
require "os" require "os"
require "os/global" require "os/global"
@ -59,7 +62,7 @@ require "os/global"
module Homebrew module Homebrew
extend FileUtils extend FileUtils
DEFAULT_PREFIX ||= "/usr/local" DEFAULT_PREFIX ||= HOMEBREW_DEFAULT_PREFIX
DEFAULT_CELLAR = "#{DEFAULT_PREFIX}/Cellar" DEFAULT_CELLAR = "#{DEFAULT_PREFIX}/Cellar"
DEFAULT_REPOSITORY = "#{DEFAULT_PREFIX}/Homebrew" DEFAULT_REPOSITORY = "#{DEFAULT_PREFIX}/Homebrew"

4
Library/Homebrew/os/linux/global.rb
View File

@ -2,8 +2,8 @@
module Homebrew module Homebrew
DEFAULT_PREFIX ||= if ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] DEFAULT_PREFIX ||= if ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"]
"/usr/local" HOMEBREW_DEFAULT_PREFIX
else else
"/home/linuxbrew/.linuxbrew" LINUXBREW_DEFAULT_PREFIX
end.freeze end.freeze
end end