diff options
| author | Jack Nagel | 2014-03-15 16:48:30 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-15 16:56:40 -0500 |
| commit | 13f8c7ab95e8e98fd300676812aa21aa4bfe2384 (patch) | |
| tree | 31b72e5ecc54f7d2ffad5effea1e1605c9d967e8 /Library | |
| parent | 088c774d87edafd805735a9c4b0a1a25dc11b42c (diff) | |
| download | brew-13f8c7ab95e8e98fd300676812aa21aa4bfe2384.tar.bz2 | |
Refactor ARGV.kegs
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 911d49f6b..cc2644974 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 |
