mv share/doc/name-version to share/doc/name

Versioned docs don't make sense with our installation pattern

2 files changed, 11 insertions, 2 deletions

diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index 3adbe5195..95243810c 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -87,9 +87,15 @@ end
 
 # make our code neater
 class Pathname
-  def mv dst
+  def mv dst    
     FileUtils.mv to_s, dst
   end
+  
+  def rename dst
+    dst=Pathname.new dst
+    dst.unlink if dst.exist?
+    mv dst
+  end
 
   def install src
     FileUtils.mv src, to_s
diff --git a/bin/brew b/bin/brew
index 47f84baec..d169f87ae 100755
--- a/bin/brew
+++ b/bin/brew
@@ -219,12 +219,15 @@ begin
           o.brew do
             if ARGV.include? '--interactive'
               ohai "Entering interactive mode, type `exit' to return to this shell"
-              exec "bash"
+              exec "bash" #TODO why exec?
             else
               o.install
               ['README','ChangeLog','COPYING','COPYRIGHT','AUTHORS'].each do |file|
                 FileUtils.cp file, o.prefix if File.file? file
               end
+              #this is common, and we don't want it
+              versioned_docs=o.doc.parent+"#{o.name}-#{o.version}"
+              versioned_docs.rename o.doc if versioned_docs.exist?
             end
           end
           ohai 'Finishing up'