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

Simplify the library path determination code a little

Browse Source
This commit is contained in:
Max Howell 2009-11-07 18:10:30 +00:00
parent 86516e563f
commit 96d790edc1
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/brew
View File

@ -5,19 +5,10 @@
# odd exceptions. Reduce our support burden by showing a user-friendly error. # odd exceptions. Reduce our support burden by showing a user-friendly error.
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 = ENV['HOMEBREW_BREW_FILE'] = File.expand_path(__FILE__)
ENV['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE
def homebrew_rubylib_path require 'pathname'
lib_path = "/../../Library/Homebrew" $:.unshift((Pathname.new(__FILE__).realpath.dirname.parent+"Library"+"Homebrew").to_s)
# Library/Homebrew is relative to the real path of brew
brew_path = __FILE__
brew_path = File.readlink(brew_path) if File.symlink? brew_path
return File.expand_path(brew_path+lib_path)
end
$:.unshift homebrew_rubylib_path
require 'global' require 'global'
case ARGV.first case ARGV.first
@ -65,7 +56,7 @@ HOMEBREW_CACHE: #{HOMEBREW_CACHE}
HOMEBREW_REPOSITORY: #{HOMEBREW_REPOSITORY} HOMEBREW_REPOSITORY: #{HOMEBREW_REPOSITORY}
\tWhere is our .git? \tWhere is our .git?
library path: #{homebrew_rubylib_path} Library path: #{$:.first}
\tWhat do we put on the ruby path? \tWhat do we put on the ruby path?
EOS EOS
end end