From 13f8c7ab95e8e98fd300676812aa21aa4bfe2384 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 15 Mar 2014 16:48:30 -0500 Subject: [PATCH] Refactor ARGV.kegs --- Library/Homebrew/extend/ARGV.rb | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 911d49f6b1..cc2644974a 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -33,19 +33,14 @@ module HomebrewArgvExtension linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name - if not linked_keg_ref.symlink? - if dirs.length == 1 - Keg.new(dirs.first) - else - prefix = Formula.factory(canonical_name).prefix - if prefix.directory? - Keg.new(prefix) - else - raise MultipleVersionsInstalledError.new(name) - end - end - else + if linked_keg_ref.symlink? Keg.new(linked_keg_ref.realpath) + elsif dirs.length == 1 + Keg.new(dirs.first) + elsif (prefix = Formula.factory(canonical_name).prefix).directory? + Keg.new(prefix) + else + raise MultipleVersionsInstalledError.new(name) end end rescue FormulaUnavailableError