Refactor ARGV.kegs

This commit is contained in:
Jack Nagel 2014-03-15 16:48:30 -05:00
parent 088c774d87
commit 13f8c7ab95

View File

@ -33,21 +33,16 @@ module HomebrewArgvExtension
linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name
if not linked_keg_ref.symlink? if linked_keg_ref.symlink?
if dirs.length == 1 Keg.new(linked_keg_ref.realpath)
elsif dirs.length == 1
Keg.new(dirs.first) Keg.new(dirs.first)
else elsif (prefix = Formula.factory(canonical_name).prefix).directory?
prefix = Formula.factory(canonical_name).prefix
if prefix.directory?
Keg.new(prefix) Keg.new(prefix)
else else
raise MultipleVersionsInstalledError.new(name) raise MultipleVersionsInstalledError.new(name)
end end
end end
else
Keg.new(linked_keg_ref.realpath)
end
end
rescue FormulaUnavailableError rescue FormulaUnavailableError
if rack if rack
raise <<-EOS.undent raise <<-EOS.undent