aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorJack Nagel2014-06-26 22:44:31 -0500
committerJack Nagel2014-06-26 22:57:49 -0500
commitcfd02fd415af2583dcaccd40260405670668857d (patch)
tree406f4a90ec3a5b9282075c3e43b7956aa503e8ea /Library/Homebrew/extend
parent401bc1c6c7b43bc0f1de6c135a544d3af1ef002b (diff)
downloadbrew-cfd02fd415af2583dcaccd40260405670668857d.tar.bz2
Use canonical_name when checking LinkedKegs and opt
name is the user-provided string and may be an alias, path, or URL.
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ARGV.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 23a66004f..1349492ea 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -20,10 +20,10 @@ module HomebrewArgvExtension
rack = HOMEBREW_CELLAR/canonical_name
dirs = rack.directory? ? rack.subdirs : []
- raise NoSuchKegError.new(rack.basename.to_s) if dirs.empty?
+ raise NoSuchKegError.new(canonical_name) if dirs.empty?
- linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name
- opt_prefix = HOMEBREW_PREFIX/"opt"/name
+ linked_keg_ref = HOMEBREW_LIBRARY.join("LinkedKegs", canonical_name)
+ opt_prefix = HOMEBREW_PREFIX.join("opt", canonical_name)
begin
if opt_prefix.symlink? && opt_prefix.directory?