From e0216d95af90f485d5a44f255dd5f0b62d71c2a6 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 15 Mar 2014 16:50:53 -0500 Subject: Prefer opt prefix over linked keg entry when picking active keg --- Library/Homebrew/extend/ARGV.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Library') 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) -- cgit v1.2.3