Use Pathname support for renames.

6 files changed, 7 insertions, 20 deletions

diff --git a/Library/Formula/bonnie.rb b/Library/Formula/bonnie.rb
index 25dcc39b4..ef560a284 100644
--- a/Library/Formula/bonnie.rb
+++ b/Library/Formula/bonnie.rb
@@ -9,7 +9,6 @@ class Bonnie <Formula
 
   def install
     system "make"
-    system "mkdir -p #{prefix}/bin"
-    system "cp Bonnie #{prefix}/bin/bonnie"
+    bin.install "Bonnie" => "bonnie"
   end
 end
diff --git a/Library/Formula/leiningen.rb b/Library/Formula/leiningen.rb
index df0959c93..1fa289b22 100644
--- a/Library/Formula/leiningen.rb
+++ b/Library/Formula/leiningen.rb
@@ -10,7 +10,6 @@ class Leiningen <Formula
     prefix.install 'bin'
 
     # Install the lein bash completion file
-    mv 'bash_completion.bash', 'lein-completion.bash'
-    (etc+'bash_completion.d').install 'lein-completion.bash'
+    (etc+'bash_completion.d').install 'bash_completion.bash' => 'lein-completion.bash'
   end
 end
diff --git a/Library/Formula/linklint.rb b/Library/Formula/linklint.rb
index 314a09d80..45db7d4c7 100644
--- a/Library/Formula/linklint.rb
+++ b/Library/Formula/linklint.rb
@@ -7,8 +7,6 @@ class Linklint <Formula
 
   def install
     FileUtils.mv 'READ_ME.txt', 'README'
-    bin.install 'linklint-2.3.5'
-    Dir.chdir bin
-    FileUtils.mv 'linklint-2.3.5', 'linklint'
+    bin.install 'linklint-2.3.5' => 'linklint'
   end
 end
diff --git a/Library/Formula/memcache-top.rb b/Library/Formula/memcache-top.rb
index 90bfac45c..7b85ed35a 100644
--- a/Library/Formula/memcache-top.rb
+++ b/Library/Formula/memcache-top.rb
@@ -7,7 +7,6 @@ class MemcacheTop <Formula
   version '0.6'
 
   def install
-    FileUtils.mv 'memcache-top-v0.6', 'memcache-top'
-    bin.install 'memcache-top'
+    bin.install 'memcache-top-v0.6' => 'memcache-top'
   end
 end
diff --git a/Library/Formula/v8.rb b/Library/Formula/v8.rb
index e8f5eece1..91f6a711c 100644
--- a/Library/Formula/v8.rb
+++ b/Library/Formula/v8.rb
@@ -22,9 +22,7 @@ class V8 <Formula
 
     include.install(Dir['include/*'])
     lib.install(Dir['libv8.*'])
-
-    mv('shell', 'v8')
-    bin.install('v8')
+    bin.install 'shell' => 'v8'
 
     system "install_name_tool -change libv8.dylib #{lib}/libv8.dylib #{bin+'v8'}"
   end
diff --git a/Library/Formula/xspin.rb b/Library/Formula/xspin.rb
index b9cd44767..437dda17e 100644
--- a/Library/Formula/xspin.rb
+++ b/Library/Formula/xspin.rb
@@ -13,14 +13,8 @@ class Xspin <Formula
   end
 
   def install
-    version='523'
-
-    fname = "xspin#{version}.tcl"
-
-    inreplace fname, "CELLAR", prefix
-
-    FileUtils.mv fname, "xspin"
-    bin.install "xspin"
+    inreplace "xspin523.tcl", "CELLAR", prefix
+    bin.install "xspin523.tcl" => "xspin"
   end
 end