8 files changed, 12 insertions, 21 deletions
diff --git a/Library/Formula/aws-elasticbeanstalk.rb b/Library/Formula/aws-elasticbeanstalk.rb
index 3ac6a8df6..d54f40627 100644
--- a/Library/Formula/aws-elasticbeanstalk.rb
+++ b/Library/Formula/aws-elasticbeanstalk.rb
@@ -7,10 +7,7 @@ class AwsElasticbeanstalk < AmazonWebServicesFormula
 
   def install
     # Remove versions for other platforms.
-    rm_rf Dir['eb/windows']
-    rm_rf Dir['eb/linux']
-    rm_rf Dir['AWSDevTools/Windows']
-
+    rm_rf %w{eb/windows eb/linux AWSDevTools/Windows}
     libexec.install %w{AWSDevTools api eb}
     bin.install_symlink libexec/"eb/macosx/python2.7/eb"
   end
diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index 06a75e45f..385eeaddc 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -70,7 +70,7 @@ class Emacs < Formula
   def do_not_install_ctags
     unless build.include? "keep-ctags"
       (bin/"ctags").unlink
-      (share/man/man1/"ctags.1.gz").unlink
+      (man1/"ctags.1.gz").unlink
     end
   end
 
diff --git a/Library/Formula/jena.rb b/Library/Formula/jena.rb
index 3477f0fcc..be678a4a3 100644
--- a/Library/Formula/jena.rb
+++ b/Library/Formula/jena.rb
@@ -14,10 +14,8 @@ class Jena < Formula
   end
 
   def install
-    # Remove Windows scripts
-    rm_rf Dir['bat']
+    rm_rf "bat" # Remove Windows scripts
 
-    # Install files
     prefix.install %w{ LICENSE ReleaseNotes-Jena.txt NOTICE ReleaseNotes-TDB.txt README ReleaseNotes-ARQ.txt }
     doc.install ['javadoc-arq', 'javadoc-core', 'javadoc-sdb', 'javadoc-tdb', 'src-examples']
     libexec.install Dir['*']
diff --git a/Library/Formula/liquibase.rb b/Library/Formula/liquibase.rb
index 65a9d2330..d003b58d8 100644
--- a/Library/Formula/liquibase.rb
+++ b/Library/Formula/liquibase.rb
@@ -7,9 +7,7 @@ class Liquibase < Formula
 
   def install
     rm_f Dir['*.bat']
-
-    chmod 0755, Dir['liquibase']
-
+    chmod 0755, 'liquibase'
     prefix.install_metafiles
     libexec.install Dir['*']
     bin.install_symlink libexec+'liquibase'
diff --git a/Library/Formula/plan9port.rb b/Library/Formula/plan9port.rb
index e0c87d91c..4f3b95a8b 100644
--- a/Library/Formula/plan9port.rb
+++ b/Library/Formula/plan9port.rb
@@ -10,7 +10,7 @@ class Plan9port < Formula
     system "./INSTALL"
 
     libexec.install Dir["*"]
-    bin.install_symlink Dir["#{libexec}/bin/9"]
+    bin.install_symlink "#{libexec}/bin/9"
     prefix.install Dir["#{libexec}/mac/*.app"]
   end
 
diff --git a/Library/Formula/ps2eps.rb b/Library/Formula/ps2eps.rb
index 6f2fd502f..f2c513f31 100644
--- a/Library/Formula/ps2eps.rb
+++ b/Library/Formula/ps2eps.rb
@@ -11,10 +11,8 @@ class Ps2eps < Formula
 
   def install
     system "#{ENV.cc} #{ENV.cflags} src/C/bbox.c -o bbox"
-    bin.install 'bin/ps2eps'
-    bin.install 'bbox'
-    share.install Dir['doc/man']
-    doc.install Dir['doc/pdf']
-    doc.install Dir['doc/html']
+    bin.install "bin/ps2eps", "bbox"
+    share.install "doc/man"
+    doc.install "doc/pdf", "doc/html"
   end
 end
diff --git a/Library/Formula/riak.rb b/Library/Formula/riak.rb
index 693e08f88..c7f13f1a8 100644
--- a/Library/Formula/riak.rb
+++ b/Library/Formula/riak.rb
@@ -17,8 +17,8 @@ class Riak < Formula
 
   def install
     libexec.install Dir['*']
-    inreplace Dir["#{libexec}/lib/env.sh"] do |s|
-      s.change_make_var! "RUNNER_BASE_DIR", prefix/libexec
+    inreplace "#{libexec}/lib/env.sh" do |s|
+      s.change_make_var! "RUNNER_BASE_DIR", libexec
     end
     bin.write_exec_script libexec/'bin/riak'
     bin.write_exec_script libexec/'bin/riak-admin'
diff --git a/Library/Formula/sonar.rb b/Library/Formula/sonar.rb
index 4d8169517..5ef244711 100644
--- a/Library/Formula/sonar.rb
+++ b/Library/Formula/sonar.rb
@@ -10,9 +10,9 @@ class Sonar < Formula
     rm_rf Dir['bin/{aix,hpux,linux,solaris,windows}-*']
 
     if MacOS.prefer_64_bit?
-      rm_rf Dir['bin/macosx-universal-32']
+      rm_rf "bin/macosx-universal-32"
     else
-      rm_rf Dir['bin/macosx-universal-64']
+      rm_rf "bin/macosx-universal-64"
     end
 
     # Delete Windows files