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

Set ENV[HOMEBREW_BREW_FILE]

Browse Source 
Thus install.rb gets the path to the instantiating brew process rather than whichever is first in the PATH. Not to mention Homebrew doesn't *have* to be in the PATH.
This commit is contained in:
Max Howell 2009-11-07 18:09:48 +00:00
parent 6b18d5572d
commit 86516e563f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/global.rb
View File

@ -38,6 +38,10 @@ else
HOMEBREW_CACHE=Pathname.new("~/Library/Caches/Homebrew").expand_path HOMEBREW_CACHE=Pathname.new("~/Library/Caches/Homebrew").expand_path
end end
if not defined? HOMEBREW_BREW_FILE
HOMEBREW_BREW_FILE = ENV['HOMEBREW_BREW_FILE'] or `which brew`.chomp
end
HOMEBREW_PREFIX = Pathname.new(HOMEBREW_BREW_FILE).dirname.parent # Where we link under HOMEBREW_PREFIX = Pathname.new(HOMEBREW_BREW_FILE).dirname.parent # Where we link under
HOMEBREW_REPOSITORY = Pathname.new(HOMEBREW_BREW_FILE).realpath.dirname.parent # Where .git is found HOMEBREW_REPOSITORY = Pathname.new(HOMEBREW_BREW_FILE).realpath.dirname.parent # Where .git is found

2
Library/Homebrew/install.rb
View File

@ -1,6 +1,4 @@
#!/usr/bin/ruby #!/usr/bin/ruby
HOMEBREW_BREW_FILE = `which brew`.strip
require 'global' require 'global'
def text_for_keg_only_formula f def text_for_keg_only_formula f

1
bin/brew
View File

@ -6,6 +6,7 @@
Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed." Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed."
HOMEBREW_BREW_FILE = File.expand_path __FILE__ HOMEBREW_BREW_FILE = File.expand_path __FILE__
ENV['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE
def homebrew_rubylib_path def homebrew_rubylib_path
lib_path = "/../../Library/Homebrew" lib_path = "/../../Library/Homebrew"