Move resolve_alias from ARGV to Formula

Also, call this function from a few places where the code was duplicated.

1 files changed, 3 insertions, 4 deletions

diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index a35ca0b49..2eb6f8e2e 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -39,9 +39,9 @@ def __make url, name
   raise "#{path} already exists" if path.exist?
 
   if Formula.aliases.include? name and not ARGV.force?
-    realname = HOMEBREW_REPOSITORY.join("Library/Aliases/#{name}").realpath.basename('.rb')
+    realname = Formula.resolve_alias(name)
     raise <<-EOS.undent
-          The formula #{realname} is already aliased to #{name}
+          "#{name}" is an alias for formula "#{realname}".
           Please check that you are not creating a duplicate.
           To force creation use --force.
           EOS
@@ -430,8 +430,7 @@ def search_brews text
   # Filter out aliases when the full name was also found
   results.reject do |alias_name|
     if aliases.include? alias_name
-      resolved_name = (HOMEBREW_REPOSITORY+"Library/Aliases/#{alias_name}").readlink.basename('.rb').to_s
-      results.include? resolved_name
+      results.include? Formula.resolve_alias(alias_name)
     end
   end
 end