Dir[] accepts multiple patterns

6 files changed, 6 insertions, 6 deletions

diff --git a/Library/Formula/avian.rb b/Library/Formula/avian.rb
index 3c6f011c8..e12f2cb49 100644
--- a/Library/Formula/avian.rb
+++ b/Library/Formula/avian.rb
@@ -17,7 +17,7 @@ class Avian < Formula
   def install
     system 'make', 'JAVA_HOME=/Library/Java/Home'
     bin.install Dir['build/darwin-*/avian*']
-    lib.install Dir['build/darwin-*/*.dylib'] + Dir['build/darwin-*/*.a']
+    lib.install Dir['build/darwin-*/*.dylib', 'build/darwin-*/*.a']
   end
 
   test do
diff --git a/Library/Formula/cassandra.rb b/Library/Formula/cassandra.rb
index 59af71770..7bc6c723b 100644
--- a/Library/Formula/cassandra.rb
+++ b/Library/Formula/cassandra.rb
@@ -27,7 +27,7 @@ class Cassandra < Formula
     rm Dir["bin/*.bat"]
 
     (etc+"cassandra").install Dir["conf/*"]
-    prefix.install Dir["*.txt"] + Dir["{bin,interface,javadoc,pylib,lib/licenses}"]
+    prefix.install Dir["*.txt", "{bin,interface,javadoc,pylib,lib/licenses}"]
     prefix.install Dir["lib/*.jar"]
 
     share.install [bin+'cassandra.in.sh', bin+'stop-server']
diff --git a/Library/Formula/cfitsio.rb b/Library/Formula/cfitsio.rb
index 0acb048f5..c745ed5f6 100644
--- a/Library/Formula/cfitsio.rb
+++ b/Library/Formula/cfitsio.rb
@@ -26,7 +26,7 @@ class Cfitsio < Formula
 
       resource('examples').stage do
         # compressed_fits.c does not work (obsolete function call)
-        Dir['*.c'].reject{|f| f == 'compress_fits.c'}.each do |f|
+        (Dir["*.c"] - ["compress_fits.c"]).each do |f|
           system ENV.cc, f, "-I#{include}", "-L#{lib}", "-lcfitsio", "-lm", "-o", "#{bin}/#{f.sub('.c', '')}"
         end
       end
diff --git a/Library/Formula/drush.rb b/Library/Formula/drush.rb
index d5e85a2fe..d05556e33 100644
--- a/Library/Formula/drush.rb
+++ b/Library/Formula/drush.rb
@@ -8,7 +8,7 @@ class Drush < Formula
 
   def install
     prefix.install_metafiles
-    libexec.install Dir['*'] -['drush.bat']
+    libexec.install Dir['*'] - ['drush.bat']
     (bin+'drush').write <<-EOS.undent
       #!/bin/sh
 
diff --git a/Library/Formula/git-tf.rb b/Library/Formula/git-tf.rb
index 0eb84fb82..919c4cd15 100644
--- a/Library/Formula/git-tf.rb
+++ b/Library/Formula/git-tf.rb
@@ -24,7 +24,7 @@ class GitTf < Formula
     (libexec + "native").install install_prefix + 'native/macosx'
 
     bin.write_exec_script libexec/'git-tf'
-    (share/'doc/git-tf').install Dir['Git-TF_*'] + Dir['ThirdPartyNotices*']
+    (share/'doc/git-tf').install Dir['Git-TF_*', 'ThirdPartyNotices*']
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/saxon.rb b/Library/Formula/saxon.rb
index b40e94f41..1a68c37ab 100644
--- a/Library/Formula/saxon.rb
+++ b/Library/Formula/saxon.rb
@@ -7,7 +7,7 @@ class Saxon < Formula
   version "9.5.1.5"
 
   def install
-    libexec.install Dir["*.jar"] + ["doc", "notices"]
+    libexec.install Dir["*.jar", "doc", "notices"]
     bin.write_jar_script libexec/"saxon9he.jar", "saxon"
   end
 end