diff options
| author | Jack Nagel | 2014-03-15 16:50:53 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-15 16:57:37 -0500 |
| commit | e0216d95af90f485d5a44f255dd5f0b62d71c2a6 (patch) | |
| tree | d5fc5e63663fb1537a70270563a077ce577feba9 | |
| parent | 3b3b782ba9c687723ccf00006c442d07ea8ff02d (diff) | |
| download | brew-e0216d95af90f485d5a44f255dd5f0b62d71c2a6.tar.bz2 | |
Prefer opt prefix over linked keg entry when picking active keg
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 2a1424234..7e331752b 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -32,8 +32,11 @@ module HomebrewArgvExtension raise NoSuchKegError.new(rack.basename.to_s) if not rack.directory? or dirs.empty? 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) elsif dirs.length == 1 Keg.new(dirs.first) |