Fix more quoting issues

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

84 files changed, 92 insertions, 88 deletions

diff --git a/Library/Formula/abyss.rb b/Library/Formula/abyss.rb
index 1e2a3af31..d2f2f951c 100644
--- a/Library/Formula/abyss.rb
+++ b/Library/Formula/abyss.rb
@@ -23,6 +23,6 @@ class Abyss < Formula
   end
 
   def test
-    system "#{bin}/ABYSS --version"
+    system "#{bin}/ABYSS", "--version"
   end
 end
diff --git a/Library/Formula/appledoc.rb b/Library/Formula/appledoc.rb
index f391c2410..9fdabca95 100644
--- a/Library/Formula/appledoc.rb
+++ b/Library/Formula/appledoc.rb
@@ -30,6 +30,6 @@ EOS
   end
 
   def test
-    system "#{bin}/appledoc --version"
+    system "#{bin}/appledoc", "--version"
   end
 end
diff --git a/Library/Formula/apt-dater.rb b/Library/Formula/apt-dater.rb
index 9eccb87fb..df8663845 100644
--- a/Library/Formula/apt-dater.rb
+++ b/Library/Formula/apt-dater.rb
@@ -23,7 +23,7 @@ class AptDater < Formula
   end
 
   def test
-    system "#{bin}/apt-dater -v"
+    system "#{bin}/apt-dater", "-v"
   end
 end
 
diff --git a/Library/Formula/arp-scan.rb b/Library/Formula/arp-scan.rb
index c0a951502..c5e372a9e 100644
--- a/Library/Formula/arp-scan.rb
+++ b/Library/Formula/arp-scan.rb
@@ -12,6 +12,6 @@ class ArpScan < Formula
   end
 
   def test
-    system "#{bin}/arp-scan -V"
+    system "#{bin}/arp-scan", "-V"
   end
 end
diff --git a/Library/Formula/autoconf.rb b/Library/Formula/autoconf.rb
index 688957f4b..0287931bc 100644
--- a/Library/Formula/autoconf.rb
+++ b/Library/Formula/autoconf.rb
@@ -21,7 +21,7 @@ class Autoconf < Formula
   end
 
   def test
-    system "#{bin}/autoconf --version"
+    system "#{bin}/autoconf", "--version"
   end
 end
 
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
index 9b04942aa..3f04e6d48 100644
--- a/Library/Formula/automake.rb
+++ b/Library/Formula/automake.rb
@@ -24,6 +24,6 @@ class Automake < Formula
   end
 
   def test
-    system "#{bin}/automake --version"
+    system "#{bin}/automake", "--version"
   end
 end
diff --git a/Library/Formula/bindfs.rb b/Library/Formula/bindfs.rb
index dd170bcc8..9a42cf0ab 100644
--- a/Library/Formula/bindfs.rb
+++ b/Library/Formula/bindfs.rb
@@ -14,6 +14,6 @@ class Bindfs < Formula
   end
 
   def test
-    system "#{bin}/bindfs -V"
+    system "#{bin}/bindfs", "-V"
   end
 end
diff --git a/Library/Formula/cdo.rb b/Library/Formula/cdo.rb
index 636fad6c8..817edf0fc 100644
--- a/Library/Formula/cdo.rb
+++ b/Library/Formula/cdo.rb
@@ -35,6 +35,6 @@ class Cdo < Formula
   end
 
   def test
-    system "#{bin}/cdo -h"
+    system "#{bin}/cdo", "-h"
   end
 end
diff --git a/Library/Formula/cfengine.rb b/Library/Formula/cfengine.rb
index a93738575..416501a5a 100644
--- a/Library/Formula/cfengine.rb
+++ b/Library/Formula/cfengine.rb
@@ -25,6 +25,6 @@ class Cfengine < Formula
   end
 
   def test
-    system "#{bin}/cf-agent -V"
+    system "#{bin}/cf-agent", "-V"
   end
 end
diff --git a/Library/Formula/checkstyle.rb b/Library/Formula/checkstyle.rb
index e14146af3..b48d61c06 100644
--- a/Library/Formula/checkstyle.rb
+++ b/Library/Formula/checkstyle.rb
@@ -21,7 +21,7 @@ class Checkstyle < Formula
       (Pathname.pwd/"Test.java").write <<-EOS.undent
         public class Test{ }
       EOS
-      system "#{bin}/checkstyle -c #{libexec}/sun_checks.xml -r Test.java"
+      system "#{bin}/checkstyle", "-c", "#{libexec}/sun_checks.xml", "-r", "Test.java"
     end
   end
 end
diff --git a/Library/Formula/clisp.rb b/Library/Formula/clisp.rb
index 0fd313b40..b79ee21ce 100644
--- a/Library/Formula/clisp.rb
+++ b/Library/Formula/clisp.rb
@@ -59,7 +59,7 @@ class Clisp < Formula
   end
 
   def test
-    system "#{bin}/clisp --version"
+    system "#{bin}/clisp", "--version"
   end
 end
 
diff --git a/Library/Formula/cliweather.rb b/Library/Formula/cliweather.rb
index 921293bc1..f655c990b 100644
--- a/Library/Formula/cliweather.rb
+++ b/Library/Formula/cliweather.rb
@@ -10,6 +10,6 @@ class Cliweather < Formula
   end
 
   def test
-    system "#{bin}/cliweather 98027"
+    system "#{bin}/cliweather", "98027"
   end
 end
diff --git a/Library/Formula/clojure.rb b/Library/Formula/clojure.rb
index 468d78af5..f128b6b3b 100644
--- a/Library/Formula/clojure.rb
+++ b/Library/Formula/clojure.rb
@@ -38,6 +38,6 @@ class Clojure < Formula
   end
 
   def test
-    system "#{bin}/clj -e \"(println \\\"Hello World\\\")\""
+    system "#{bin}/clj", "-e", '(println "Hello World")'
   end
 end
diff --git a/Library/Formula/cmake.rb b/Library/Formula/cmake.rb
index a805fde29..a2135e5ab 100644
--- a/Library/Formula/cmake.rb
+++ b/Library/Formula/cmake.rb
@@ -46,6 +46,6 @@ class Cmake < Formula
   end
 
   def test
-    system "#{bin}/cmake -E echo testing"
+    system "#{bin}/cmake", "-E", "echo", "testing"
   end
 end
diff --git a/Library/Formula/csup.rb b/Library/Formula/csup.rb
index 68e5f7cf8..9c3cbdaeb 100644
--- a/Library/Formula/csup.rb
+++ b/Library/Formula/csup.rb
@@ -13,6 +13,6 @@ class Csup < Formula
   end
 
   def test
-    system "#{bin}/csup -v"
+    system "#{bin}/csup", "-v"
   end
 end
diff --git a/Library/Formula/daemon.rb b/Library/Formula/daemon.rb
index 7d90324de..f7d930b3d 100644
--- a/Library/Formula/daemon.rb
+++ b/Library/Formula/daemon.rb
@@ -12,6 +12,6 @@ class Daemon < Formula
   end
 
   def test
-    system "#{bin}/daemon --version"
+    system "#{bin}/daemon", "--version"
   end
 end
diff --git a/Library/Formula/dash.rb b/Library/Formula/dash.rb
index 6fd9a4430..13df39133 100644
--- a/Library/Formula/dash.rb
+++ b/Library/Formula/dash.rb
@@ -25,6 +25,6 @@ class Dash < Formula
   end
 
   def test
-    system bin/'dash', '-c', 'echo Hello!'
+    system "#{bin}/dash", "-c", "echo Hello!"
   end
 end
diff --git a/Library/Formula/dmenu.rb b/Library/Formula/dmenu.rb
index 8dba8f68b..790f71149 100644
--- a/Library/Formula/dmenu.rb
+++ b/Library/Formula/dmenu.rb
@@ -11,6 +11,6 @@ class Dmenu < Formula
   end
 
   def test
-    system "#{bin}/dmenu -v"
+    system "#{bin}/dmenu", "-v"
   end
 end
diff --git a/Library/Formula/dwatch.rb b/Library/Formula/dwatch.rb
index 75b4a445f..89605e1c0 100644
--- a/Library/Formula/dwatch.rb
+++ b/Library/Formula/dwatch.rb
@@ -21,6 +21,6 @@ class Dwatch < Formula
 
   def test
     # '-h' is not actually an option, but it exits 0
-    system "#{bin}/dwatch -h"
+    system "#{bin}/dwatch", "-h"
   end
 end
diff --git a/Library/Formula/ezlupdate.rb b/Library/Formula/ezlupdate.rb
index e741a20f1..18e7e5eae 100644
--- a/Library/Formula/ezlupdate.rb
+++ b/Library/Formula/ezlupdate.rb
@@ -12,7 +12,7 @@ class Ezlupdate < Formula
     cd "support/ezlupdate-qt4.5/ezlupdate" do
       # Use the qmake installation done with brew
       # because others installations can make a mess
-      system "#{HOMEBREW_PREFIX}/bin/qmake ezlupdate.pro"
+      system "#{HOMEBREW_PREFIX}/bin/qmake", "ezlupdate.pro"
       system "make"
     end
     bin.install 'bin/macosx/ezlupdate'
diff --git a/Library/Formula/fastjar.rb b/Library/Formula/fastjar.rb
index a1b320ad9..a1432f770 100644
--- a/Library/Formula/fastjar.rb
+++ b/Library/Formula/fastjar.rb
@@ -12,7 +12,7 @@ class Fastjar < Formula
   end
 
   def test
-    system "#{bin}/fastjar -V"
-    system "#{bin}/grepjar -V"
+    system "#{bin}/fastjar", "-V"
+    system "#{bin}/grepjar", "-V"
   end
 end
diff --git a/Library/Formula/ffmbc.rb b/Library/Formula/ffmbc.rb
index 73ad19934..4b4d5fc1f 100644
--- a/Library/Formula/ffmbc.rb
+++ b/Library/Formula/ffmbc.rb
@@ -57,6 +57,6 @@ class Ffmbc < Formula
   end
 
   def test
-    system "#{bin}/ffmbc -h"
+    system "#{bin}/ffmbc", "-h"
   end
 end
diff --git a/Library/Formula/figlet.rb b/Library/Formula/figlet.rb
index 18361cf74..9713fafdf 100644
--- a/Library/Formula/figlet.rb
+++ b/Library/Formula/figlet.rb
@@ -35,6 +35,6 @@ class Figlet < Formula
   end
 
   def test
-    system "#{bin}/figlet -f larry3d hello, figlet"
+    system "#{bin}/figlet", "-f", "larry3d", "hello, figlet"
   end
 end
diff --git a/Library/Formula/ftjam.rb b/Library/Formula/ftjam.rb
index 309aa24f1..ab2c4b235 100644
--- a/Library/Formula/ftjam.rb
+++ b/Library/Formula/ftjam.rb
@@ -6,7 +6,7 @@ class Ftjam < Formula
   md5 'e61304b370ba06f68082f0219a196576'
 
   def install
-    system "./configure --prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}"
     system 'make'
     system 'make install'
   end
diff --git a/Library/Formula/fwknop.rb b/Library/Formula/fwknop.rb
index 0ee56f2f5..db9f5d04e 100644
--- a/Library/Formula/fwknop.rb
+++ b/Library/Formula/fwknop.rb
@@ -12,6 +12,6 @@ class Fwknop < Formula
   end
 
   def test
-    system "#{bin}/fwknop --version"
+    system "#{bin}/fwknop", "--version"
   end
 end
diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb
index 043050578..227160127 100644
--- a/Library/Formula/ghc.rb
+++ b/Library/Formula/ghc.rb
@@ -58,7 +58,7 @@ class Ghc < Formula
       opoo "The current version of haskell-platform will NOT work with this version of GHC!"
     end
 
-    system "./configure --prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
 
diff --git a/Library/Formula/gmap-gsnap.rb b/Library/Formula/gmap-gsnap.rb
index 84dca2a2e..fd1a79b15 100644
--- a/Library/Formula/gmap-gsnap.rb
+++ b/Library/Formula/gmap-gsnap.rb
@@ -26,6 +26,6 @@ class GmapGsnap < Formula
   end
 
   def test
-    system "#{bin}/gsnap --version"
+    system "#{bin}/gsnap", "--version"
   end
 end
diff --git a/Library/Formula/gnu-arch.rb b/Library/Formula/gnu-arch.rb
index db7b28356..f15c40e8a 100644
--- a/Library/Formula/gnu-arch.rb
+++ b/Library/Formula/gnu-arch.rb
@@ -16,6 +16,6 @@ class GnuArch < Formula
   end
 
   def test
-    system "#{bin}/tla -V"
+    system "#{bin}/tla", "-V"
   end
 end
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index 025a8e8e6..477feccde 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -56,6 +56,6 @@ class Gnuplot < Formula
   end
 
   def test
-    system "#{bin}/gnuplot --version"
+    system "#{bin}/gnuplot", "--version"
   end
 end
diff --git a/Library/Formula/gsoap.rb b/Library/Formula/gsoap.rb
index a75734e74..cec3cadb8 100644
--- a/Library/Formula/gsoap.rb
+++ b/Library/Formula/gsoap.rb
@@ -12,6 +12,6 @@ class Gsoap < Formula
   end
 
   def test
-    system "#{bin}/soapcpp2 -v"
+    system "#{bin}/soapcpp2", "-v"
   end
 end
diff --git a/Library/Formula/hilite.rb b/Library/Formula/hilite.rb
index 0d4098f18..e813752be 100644
--- a/Library/Formula/hilite.rb
+++ b/Library/Formula/hilite.rb
@@ -12,6 +12,6 @@ class Hilite < Formula
   end
 
   def test
-    `#{bin}/hilite bash -c "echo 'stderr in red' >&2"`
+    system "#{bin}/hilite", "bash", "-c", "echo 'stderr in red' >&2"
   end
 end
diff --git a/Library/Formula/htpdate.rb b/Library/Formula/htpdate.rb
index f717c4e42..8905e7697 100644
--- a/Library/Formula/htpdate.rb
+++ b/Library/Formula/htpdate.rb
@@ -14,6 +14,6 @@ class Htpdate < Formula
   end
 
   def test
-    system "#{bin}/htpdate -h"
+    system "#{bin}/htpdate", "-h"
   end
 end
diff --git a/Library/Formula/imapfilter.rb b/Library/Formula/imapfilter.rb
index 8da9f5fd2..4860617c3 100644
--- a/Library/Formula/imapfilter.rb
+++ b/Library/Formula/imapfilter.rb
@@ -22,6 +22,6 @@ class Imapfilter < Formula
   end
 
   def test
-    system "#{bin}/imapfilter -V"
+    system "#{bin}/imapfilter", "-V"
   end
 end
diff --git a/Library/Formula/ispc.rb b/Library/Formula/ispc.rb
index 07a121774..9598369fa 100644
--- a/Library/Formula/ispc.rb
+++ b/Library/Formula/ispc.rb
@@ -11,6 +11,6 @@ class Ispc < Formula
   end
 
   def test
-    system "#{bin}/ispc -v"
+    system "#{bin}/ispc", "-v"
   end
 end
diff --git a/Library/Formula/ivy.rb b/Library/Formula/ivy.rb
index ca45b9823..b94355868 100644
--- a/Library/Formula/ivy.rb
+++ b/Library/Formula/ivy.rb
@@ -16,6 +16,6 @@ class Ivy < Formula
   end
 
   def test
-    system "#{bin}/ivy -version"
+    system "#{bin}/ivy", "-version"
   end
 end
diff --git a/Library/Formula/jcal.rb b/Library/Formula/jcal.rb
index 601c63ed1..8962b17d6 100644
--- a/Library/Formula/jcal.rb
+++ b/Library/Formula/jcal.rb
@@ -21,7 +21,7 @@ class Jcal < Formula
   end
 
   def test
-    system "#{bin}/jcal -y"
+    system "#{bin}/jcal", "-y"
     system "#{bin}/jdate"
   end
 end
diff --git a/Library/Formula/jigdo.rb b/Library/Formula/jigdo.rb
index 7f451a932..daa3b4fd8 100644
--- a/Library/Formula/jigdo.rb
+++ b/Library/Formula/jigdo.rb
@@ -18,6 +18,6 @@ class Jigdo < Formula
   end
 
   def test
-    system "#{bin}/jigdo-file -h"
+    system "#{bin}/jigdo-file", "-h"
   end
 end
diff --git a/Library/Formula/jp2a.rb b/Library/Formula/jp2a.rb
index 8d079dace..553f79425 100644
--- a/Library/Formula/jp2a.rb
+++ b/Library/Formula/jp2a.rb
@@ -14,6 +14,6 @@ class Jp2a < Formula
   end
 
   def test
-    system "#{bin}/jp2a -V"
+    system "#{bin}/jp2a", "-V"
   end
 end
diff --git a/Library/Formula/jpeginfo.rb b/Library/Formula/jpeginfo.rb
index 31fb0a6b3..bbb4442a5 100644
--- a/Library/Formula/jpeginfo.rb
+++ b/Library/Formula/jpeginfo.rb
@@ -14,6 +14,6 @@ class Jpeginfo < Formula
   end
 
   def test
-    system "#{bin}/jpeginfo --help"
+    system "#{bin}/jpeginfo", "--help"
   end
 end
diff --git a/Library/Formula/justniffer.rb b/Library/Formula/justniffer.rb
index b8215d657..7c695539d 100644
--- a/Library/Formula/justniffer.rb
+++ b/Library/Formula/justniffer.rb
@@ -28,7 +28,7 @@ class Justniffer < Formula
   end
 
   def install
-    system "./configure --prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
 
diff --git a/Library/Formula/libidn.rb b/Library/Formula/libidn.rb
index 9b5672ff3..97efeb5e1 100644
--- a/Library/Formula/libidn.rb
+++ b/Library/Formula/libidn.rb
@@ -17,6 +17,6 @@ class Libidn < Formula
   end
 
   def test
-    system "#{bin}/idn --version"
+    system "#{bin}/idn", "--version"
   end
 end
diff --git a/Library/Formula/libtool.rb b/Library/Formula/libtool.rb
index 488d18a4f..bf07c6bd2 100644
--- a/Library/Formula/libtool.rb
+++ b/Library/Formula/libtool.rb
@@ -28,6 +28,6 @@ class Libtool < Formula
   end
 
   def test
-    system "#{bin}/glibtoolize --version"
+    system "#{bin}/glibtoolize", "--version"
   end
 end
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index d09ca57f1..e7c838b5f 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -105,7 +105,7 @@ class Llvm < Formula
   end
 
   def test
-    system "#{bin}/llvm-config --version"
+    system "#{bin}/llvm-config", "--version"
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb
index 1333ca1f5..7bf9b0867 100644
--- a/Library/Formula/luarocks.rb
+++ b/Library/Formula/luarocks.rb
@@ -43,7 +43,7 @@ class Luarocks < Formula
 
   def test
     opoo "Luarocks test script installs 'lpeg'"
-    system "#{bin}/luarocks install lpeg"
+    system "#{bin}/luarocks", "install", "lpeg"
     system "lua", "-llpeg", "-e", 'print ("Hello World!")'
   end
 end
diff --git a/Library/Formula/maxima.rb b/Library/Formula/maxima.rb
index 0dcbea6c6..9cb914006 100644
--- a/Library/Formula/maxima.rb
+++ b/Library/Formula/maxima.rb
@@ -28,7 +28,7 @@ class Maxima < Formula
   end
 
   def test
-    system "#{bin}/maxima --batch-string='run_testsuite(); quit();'"
+    system "#{bin}/maxima", "--batch-string='run_testsuite(); quit();'"
   end
 end
 
diff --git a/Library/Formula/md5sha1sum.rb b/Library/Formula/md5sha1sum.rb
index 2b5e07c05..20698a07d 100644
--- a/Library/Formula/md5sha1sum.rb
+++ b/Library/Formula/md5sha1sum.rb
@@ -6,7 +6,7 @@ class Md5sha1sum < Formula
   md5 'a75c5e21071ffa66fad1001de040517a'
 
   def install
-    system "./configure --prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}"
     system "make"
     bin.install 'md5sum'
     bin.install_symlink bin/'md5sum' => 'sha1sum'
diff --git a/Library/Formula/monit.rb b/Library/Formula/monit.rb
index 9107910e9..50ff42a55 100644
--- a/Library/Formula/monit.rb
+++ b/Library/Formula/monit.rb
@@ -13,6 +13,6 @@ class Monit < Formula
   end
 
   def test
-    system "#{bin}/monit -h"
+    system "#{bin}/monit", "-h"
   end
 end
diff --git a/Library/Formula/mydumper.rb b/Library/Formula/mydumper.rb
index 0e3d9f7af..da39fd3b0 100644
--- a/Library/Formula/mydumper.rb
+++ b/Library/Formula/mydumper.rb
@@ -40,6 +40,6 @@ class Mydumper < Formula
   end
 
   def test
-    system "#{bin}/mydumper --version"
+    system "#{bin}/mydumper", "--version"
   end
 end
diff --git a/Library/Formula/ndiff.rb b/Library/Formula/ndiff.rb
index 8ccfc3079..ac4a34c70 100644
--- a/Library/Formula/ndiff.rb
+++ b/Library/Formula/ndiff.rb
@@ -17,6 +17,6 @@ class Ndiff < Formula
   end
 
   def test
-    system "#{bin}/ndiff --help"
+    system "#{bin}/ndiff", "--help"
   end
 end
diff --git a/Library/Formula/neko.rb b/Library/Formula/neko.rb
index 6fcc1d7ee..d54bf98b8 100644
--- a/Library/Formula/neko.rb
+++ b/Library/Formula/neko.rb
@@ -9,7 +9,7 @@ class Neko < Formula
 
   def install
     ENV.deparallelize # parallel build fails
-    system "yes s | make MACOSX=1 INSTALL_PREFIX=#{prefix}"
+    system "yes s | make MACOSX=1 INSTALL_PREFIX='#{prefix}'"
     prefix.install %w{bin libs src}
   end
 end
diff --git a/Library/Formula/open-cobol.rb b/Library/Formula/open-cobol.rb
index 1e86c4bdb..37e9f03ce 100644
--- a/Library/Formula/open-cobol.rb
+++ b/Library/Formula/open-cobol.rb
@@ -15,6 +15,6 @@ class OpenCobol < Formula
   end
 
   def test
-    system "#{bin}/cobc --help"
+    system "#{bin}/cobc", "--help"
   end
 end
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
index af1d497c5..82ce89d31 100644
--- a/Library/Formula/pango.rb
+++ b/Library/Formula/pango.rb
@@ -39,8 +39,11 @@ class Pango < Formula
 
   def test
     mktemp do
-      system "#{bin}/pango-view -t 'test-image' --waterfall --rotate=10 --annotate=1 --header -q -o output.png"
-      system "/usr/bin/qlmanage -p output.png"
+      system "#{bin}/pango-view", "-t", "test-image",
+                                  "--waterfall", "--rotate=10",
+                                  "--annotate=1", "--header",
+                                  "-q", "-o", "output.png"
+      system "/usr/bin/qlmanage", "-p", "output.png"
     end
   end
 end
diff --git a/Library/Formula/pdfgrep.rb b/Library/Formula/pdfgrep.rb
index 4ea7197b0..75bdfb71a 100644
--- a/Library/Formula/pdfgrep.rb
+++ b/Library/Formula/pdfgrep.rb
@@ -15,6 +15,6 @@ class Pdfgrep < Formula
   end
 
   def test
-    system "#{bin}/pdfgrep --version"
+    system "#{bin}/pdfgrep", "--version"
   end
 end
diff --git a/Library/Formula/pipebench.rb b/Library/Formula/pipebench.rb
index fae73b338..47aa2929a 100644
--- a/Library/Formula/pipebench.rb
+++ b/Library/Formula/pipebench.rb
@@ -12,6 +12,6 @@ class Pipebench < Formula
   end
 
   def test
-    system "#{bin}/pipebench -h"
+    system "#{bin}/pipebench", "-h"
   end
 end
diff --git a/Library/Formula/pixie.rb b/Library/Formula/pixie.rb
index f916a00cd..ff7897db6 100644
--- a/Library/Formula/pixie.rb
+++ b/Library/Formula/pixie.rb
@@ -23,6 +23,6 @@ class Pixie < Formula
   end
 
   def test
-    system "#{bin}/rndr -v"
+    system "#{bin}/rndr", "-v"
   end
 end
diff --git a/Library/Formula/povray.rb b/Library/Formula/povray.rb
index 577373a5a..4bd2dbaf3 100644
--- a/Library/Formula/povray.rb
+++ b/Library/Formula/povray.rb
@@ -24,7 +24,7 @@ class Povray < Formula
   def test
     ohai "Rendering all test scenes; this may take a while"
     mktemp do
-      system "#{share}/povray-3.6/scripts/allscene.sh -o ."
+      system "#{share}/povray-3.6/scripts/allscene.sh", "-o", "."
     end
   end
 end
diff --git a/Library/Formula/primesieve.rb b/Library/Formula/primesieve.rb
index 336c4cb57..5bd43d248 100644
--- a/Library/Formula/primesieve.rb
+++ b/Library/Formula/primesieve.rb
@@ -14,6 +14,6 @@ class Primesieve < Formula
   end
 
   def test
-    system "#{bin}/primesieve -v"
+    system "#{bin}/primesieve", "-v"
   end
 end
diff --git a/Library/Formula/psftools.rb b/Library/Formula/psftools.rb
index d70979932..3b7e2b06b 100644
--- a/Library/Formula/psftools.rb
+++ b/Library/Formula/psftools.rb
@@ -20,7 +20,7 @@ class Psftools < Formula
     # The zip file has a fon in it, use fon2fnts to extrat to fnt
     mktemp do
       Pc8x8Font.new.brew do
-        system "#{bin}/fon2fnts pc8x8.fon"
+        system "#{bin}/fon2fnts", "pc8x8.fon"
         raise unless File.exist? "PC8X8_9.fnt"
       end
     end
diff --git a/Library/Formula/pyqwt.rb b/Library/Formula/pyqwt.rb
index 9eceac79d..6c478a870 100644
--- a/Library/Formula/pyqwt.rb
+++ b/Library/Formula/pyqwt.rb
@@ -39,7 +39,7 @@ class Pyqwt < Formula
   end
 
   def test
-    system "python -c 'from PyQt4 import Qwt5 as Qwt'"
+    system "python", "-c", "from PyQt4 import Qwt5 as Qwt"
   end
 end
 
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 7e21b2a38..bff2e8d8b 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -113,7 +113,7 @@ class Qt < Formula
   end
 
   def test
-    "#{bin}/qmake --version"
+    system "#{bin}/qmake", "--version"
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/rc.rb b/Library/Formula/rc.rb
index ce2fe9f04..cb4ec4eec 100644
--- a/Library/Formula/rc.rb
+++ b/Library/Formula/rc.rb
@@ -6,12 +6,12 @@ class Rc < Formula
   md5 '4a85e4b4e3a0a5d3803109c5b2dce710'
 
   def install
-    system "./configure","--prefix=#{prefix}", "--mandir=#{man}", "--with-editline"
+    system "./configure", "--prefix=#{prefix}", "--mandir=#{man}", "--with-editline"
     system "make"
     system "make install"
   end
 
   def test
-    system "#{bin}/rc -c 'echo $*' Hello!"
+    system "#{bin}/rc", "-c", "echo Hello!"
   end
 end
diff --git a/Library/Formula/rsense.rb b/Library/Formula/rsense.rb
index de0f40289..c78ab0505 100644
--- a/Library/Formula/rsense.rb
+++ b/Library/Formula/rsense.rb
@@ -30,6 +30,6 @@ class Rsense < Formula
   end
 
   def test
-    system "#{bin}/rsense version"
+    system "#{bin}/rsense", "version"
   end
 end
diff --git a/Library/Formula/tal.rb b/Library/Formula/tal.rb
index 57f4eab98..162a45c3f 100644
--- a/Library/Formula/tal.rb
+++ b/Library/Formula/tal.rb
@@ -12,6 +12,6 @@ class Tal < Formula
   end
 
   def test
-    system "#{bin}/tal /etc/passwd"
+    system "#{bin}/tal", "/etc/passwd"
   end
 end
diff --git a/Library/Formula/tcpurify.rb b/Library/Formula/tcpurify.rb
index 94ddfbde1..799eaed1a 100644
--- a/Library/Formula/tcpurify.rb
+++ b/Library/Formula/tcpurify.rb
@@ -11,6 +11,6 @@ class Tcpurify < Formula
   end
 
   def test
-    system "#{bin}/tcpurify -v" # Using -v, as without that it returns -1
+    system "#{bin}/tcpurify", "-v"
   end
 end
diff --git a/Library/Formula/the_silver_searcher.rb b/Library/Formula/the_silver_searcher.rb
index 622c57341..148c308c8 100644
--- a/Library/Formula/the_silver_searcher.rb
+++ b/Library/Formula/the_silver_searcher.rb
@@ -29,6 +29,6 @@ class TheSilverSearcher < Formula
   end
 
   def test
-    system "#{bin}/ag --version"
+    system "#{bin}/ag", "--version"
   end
 end
diff --git a/Library/Formula/tkdiff.rb b/Library/Formula/tkdiff.rb
index 3472b30e6..a3e1a07ca 100644
--- a/Library/Formula/tkdiff.rb
+++ b/Library/Formula/tkdiff.rb
@@ -10,6 +10,6 @@ class Tkdiff < Formula
   end
 
   def test
-    system "#{bin}/tkdiff --help"
+    system "#{bin}/tkdiff", "--help"
   end
 end
diff --git a/Library/Formula/tmap.rb b/Library/Formula/tmap.rb
index b61ca3836..eacc91175 100644
--- a/Library/Formula/tmap.rb
+++ b/Library/Formula/tmap.rb
@@ -20,6 +20,6 @@ class Tmap < Formula
   end
 
   def test
-    system "#{bin}/tmap -v"
+    system "#{bin}/tmap", "-v"
   end
 end
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index 93a5dfaff..2e9b4e37a 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -33,6 +33,6 @@ class Tmux < Formula
   end
 
   def test
-    system "#{bin}/tmux -V"
+    system "#{bin}/tmux", "-V"
   end
 end
diff --git a/Library/Formula/trafficserver.rb b/Library/Formula/trafficserver.rb
index 494400ee1..a43165070 100644
--- a/Library/Formula/trafficserver.rb
+++ b/Library/Formula/trafficserver.rb
@@ -31,6 +31,6 @@ class Trafficserver < Formula
   end
 
   def test
-    system "#{bin}/trafficserver status"
+    system "#{bin}/trafficserver", "status"
   end
 end
diff --git a/Library/Formula/treecc.rb b/Library/Formula/treecc.rb
index 50edd6b2d..61dce1b71 100644
--- a/Library/Formula/treecc.rb
+++ b/Library/Formula/treecc.rb
@@ -12,6 +12,6 @@ class Treecc < Formula
   end
 
   def test
-    system "#{bin}/treecc -v"
+    system "#{bin}/treecc", "-v"
   end
 end
diff --git a/Library/Formula/tup.rb b/Library/Formula/tup.rb
index 1d2337600..7b7b46f93 100644
--- a/Library/Formula/tup.rb
+++ b/Library/Formula/tup.rb
@@ -17,7 +17,7 @@ class Tup < Formula
   end
 
   def test
-    system "#{bin}/tup -v"
+    system "#{bin}/tup", "-v"
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/urweb.rb b/Library/Formula/urweb.rb
index 57116a7b3..ad0724378 100644
--- a/Library/Formula/urweb.rb
+++ b/Library/Formula/urweb.rb
@@ -16,8 +16,9 @@ class Urweb < Formula
   end
 
   def install
-    system "aclocal && autoreconf -i --force"
-    system "./configure --prefix=#{prefix}"
+    system "aclocal"
+    system "autoreconf -i --force"
+    system "./configure", "--prefix=#{prefix}"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/uudeview.rb b/Library/Formula/uudeview.rb
index 985f16d6f..0442bdbff 100644
--- a/Library/Formula/uudeview.rb
+++ b/Library/Formula/uudeview.rb
@@ -13,6 +13,6 @@ class Uudeview < Formula
   end
 
   def test
-    system "#{bin}/uudeview -V"
+    system "#{bin}/uudeview", "-V"
   end
 end
diff --git a/Library/Formula/vala.rb b/Library/Formula/vala.rb
index 90bb2e2b7..90440c3d5 100644
--- a/Library/Formula/vala.rb
+++ b/Library/Formula/vala.rb
@@ -19,6 +19,6 @@ class Vala < Formula
   end
 
   def test
-    system "#{bin}/valac --version"
+    system "#{bin}/valac", "--version"
   end
 end
diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb
index 7fd750c64..4efe20856 100644
--- a/Library/Formula/valgrind.rb
+++ b/Library/Formula/valgrind.rb
@@ -28,6 +28,6 @@ class Valgrind < Formula
   end
 
   def test
-    system "#{bin}/valgrind ls -l"
+    system "#{bin}/valgrind", "ls", "-l"
   end
 end
diff --git a/Library/Formula/vimpc.rb b/Library/Formula/vimpc.rb
index 5f9875f82..7bcb39344 100644
--- a/Library/Formula/vimpc.rb
+++ b/Library/Formula/vimpc.rb
@@ -28,6 +28,6 @@ class Vimpc < Formula
   end
 
   def test
-    system "#{bin}/vimpc -v"
+    system "#{bin}/vimpc", "-v"
   end
 end
diff --git a/Library/Formula/wait_on.rb b/Library/Formula/wait_on.rb
index 9eed1472d..f1122e154 100644
--- a/Library/Formula/wait_on.rb
+++ b/Library/Formula/wait_on.rb
@@ -14,6 +14,6 @@ class WaitOn < Formula
   end
 
   def test
-    system "#{bin}/wait_on -v"
+    system "#{bin}/wait_on", "-v"
   end
 end
diff --git a/Library/Formula/wbox.rb b/Library/Formula/wbox.rb
index af9cfd828..006ae4794 100644
--- a/Library/Formula/wbox.rb
+++ b/Library/Formula/wbox.rb
@@ -11,6 +11,6 @@ class Wbox < Formula
   end
 
   def test
-    system "#{bin}/wbox www.google.com 1"
+    system "#{bin}/wbox", "www.google.com", "1"
   end
 end
diff --git a/Library/Formula/wdfs.rb b/Library/Formula/wdfs.rb
index 7361dcc2f..ccaa7edc3 100644
--- a/Library/Formula/wdfs.rb
+++ b/Library/Formula/wdfs.rb
@@ -17,6 +17,6 @@ class Wdfs < Formula
   end
 
   def test
-    system "#{bin}/wdfs -v"
+    system "#{bin}/wdfs", "-v"
   end
 end
diff --git a/Library/Formula/web100clt.rb b/Library/Formula/web100clt.rb
index 3eae4e697..3e9aaf809 100644
--- a/Library/Formula/web100clt.rb
+++ b/Library/Formula/web100clt.rb
@@ -22,6 +22,6 @@ class Web100clt < Formula
   end
 
   def test
-    system "#{bin}/web100clt -v"
+    system "#{bin}/web100clt", "-v"
   end
 end
diff --git a/Library/Formula/wget.rb b/Library/Formula/wget.rb
index 0663d39d8..70c751ebe 100644
--- a/Library/Formula/wget.rb
+++ b/Library/Formula/wget.rb
@@ -35,6 +35,6 @@ class Wget < Formula
   end
 
   def test
-    system "#{bin}/wget -O - www.google.com"
+    system "#{bin}/wget", "-O", "-", "www.google.com"
   end
 end
diff --git a/Library/Formula/wput.rb b/Library/Formula/wput.rb
index 710dc0904..ede8c902b 100644
--- a/Library/Formula/wput.rb
+++ b/Library/Formula/wput.rb
@@ -20,7 +20,7 @@ class Wput < Formula
   end
 
   def test
-    system "#{bin}/wput --version"
+    system "#{bin}/wput", "--version"
   end
 end
 
diff --git a/Library/Formula/xclip.rb b/Library/Formula/xclip.rb
index a94baa606..119e965c7 100644
--- a/Library/Formula/xclip.rb
+++ b/Library/Formula/xclip.rb
@@ -12,6 +12,6 @@ class Xclip < Formula
   end
 
   def test
-    system "#{bin}/xclip -version"
+    system "#{bin}/xclip", "-version"
   end
 end
diff --git a/Library/Formula/zsh.rb b/Library/Formula/zsh.rb
index 4e0bfa7f5..f6278469c 100644
--- a/Library/Formula/zsh.rb
+++ b/Library/Formula/zsh.rb
@@ -41,7 +41,7 @@ class Zsh < Formula
   end
 
   def test
-    system "#{bin}/zsh --version"
+    system "#{bin}/zsh", "--version"
   end
 
   def caveats; <<-EOS.undent