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

Prefer opt prefix over linked keg entry when picking active keg

Browse Source
This commit is contained in:
Jack Nagel 2014-03-15 16:50:53 -05:00
parent 3b3b782ba9
commit e0216d95af
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/extend/ARGV.rb
View File

@ -32,8 +32,11 @@ module HomebrewArgvExtension
raise NoSuchKegError.new(rack.basename.to_s) if not rack.directory? or dirs.empty? raise NoSuchKegError.new(rack.basename.to_s) if not rack.directory? or dirs.empty?
linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name
opt_prefix = HOMEBREW_PREFIX/"opt"/name
if linked_keg_ref.symlink? && linked_keg_ref.directory? if opt_prefix.symlink? && opt_prefix.directory?
Keg.new(opt_prefix.realpath)
elsif linked_keg_ref.symlink? && linked_keg_ref.directory?
Keg.new(linked_keg_ref.realpath) Keg.new(linked_keg_ref.realpath)
elsif dirs.length == 1 elsif dirs.length == 1
Keg.new(dirs.first) Keg.new(dirs.first)