Correct --prefix behaviour

1 files changed, 5 insertions, 22 deletions

diff --git a/bin/brew b/bin/brew
index 58467a587..c94345f25 100755
--- a/bin/brew
+++ b/bin/brew
@@ -157,27 +157,6 @@ def lnd keg, start
   end
 end
 
-def prefix
-  # Get the clean path to $prefix/Cellar/homebrew/brew/../../../
-  # Don't resolve any symlinks of that final result.
-  # Rationale: if the user calls /usr/local/bin/brew but that will resolve
-  # to /Brewery/Cellar/homebrew/brew we should give /usr/local and not
-  # /Brewery because the user probably has chosen /usr/local as the Homebrew
-  # to expose to the system.
-  if File.symlink? __FILE__
-    # using pathname as it will handle readlink returning abs or rel paths
-    d=Pathname.new(__FILE__).dirname
-    File.expand_path(d+File.readlink(__FILE__)+'../../../')
-  else
-    # Dir.pwd resolves the symlink :P #rubysucks
-    # we use the cwd because __FILE__ can be relative and expand_path
-    # resolves the symlink for the working directory if fed a relative path
-    # SIGH
-    cwd=Pathname.new `pwd`.strip
-    File.expand_path(cwd+__FILE__+'../../../')
-  end
-end
-
 def usage
   name=File.basename $0
   <<-EOS
@@ -196,7 +175,11 @@ begin
     when 'prune'
       puts "Pruned #{prune} files"
     when '--prefix'
-      puts prefix
+      # we use the cwd because __FILE__ can be relative and expand_path
+      # resolves the symlink for the working directory if fed a relative path
+      # NOTE we don't use Dir.pwd because it resolves the symlink :P #rubysucks
+      cwd=Pathname.new `pwd`.strip
+      puts File.expand_path(cwd+__FILE__+'../../')
     when '--cache'
       puts File.expand_path('~/Library/Application Support/Homebrew')
     when '-h', '--help', '--usage', '-?'