diff options
| author | Adam Vandenberg | 2010-09-07 14:34:39 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2010-09-07 14:36:51 -0700 |
| commit | 1f5f63142796bd58d6f0ca11687898457cf20447 (patch) | |
| tree | 749b6721b0c52edbc08a80603b97d7da2598a3a4 /Library/Formula | |
| parent | 127b3c544f17b79fa99bbeda5c75292039a63fc2 (diff) | |
| download | homebrew-1f5f63142796bd58d6f0ca11687898457cf20447.tar.bz2 | |
brew-audit - catch more interpolation style issues
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/cdb.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/falcon.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/ioke.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/kiwi.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/liboil.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/nu.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/rabbitmq.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/rubinius.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/tinyproxy.rb | 4 |
9 files changed, 13 insertions, 11 deletions
diff --git a/Library/Formula/cdb.rb b/Library/Formula/cdb.rb index 9bb34509f..0382608bf 100644 --- a/Library/Formula/cdb.rb +++ b/Library/Formula/cdb.rb @@ -6,7 +6,7 @@ class Cdb <Formula md5 '81fed54d0bde51b147dd6c20cdb92d51' def install - inreplace "conf-home", "/usr/local", "#{prefix}" + inreplace "conf-home", "/usr/local", prefix system "make setup" end end diff --git a/Library/Formula/falcon.rb b/Library/Formula/falcon.rb index 50dc69cdf..1518efcdf 100644 --- a/Library/Formula/falcon.rb +++ b/Library/Formula/falcon.rb @@ -24,7 +24,7 @@ class Falcon <Formula def install cmake_opts = "-DCMAKE_INSTALL_NAME_DIR=#{lib}" ENV.append "EXTRA_CMAKE", cmake_opts - system "./build.sh", "-p", "#{prefix}", "-int", "-el" + system "./build.sh", "-p", prefix, "-int", "-el" system "./build.sh", "-i" # install the htmldocs for the core and standard modules (feathers) FalconHtmldocs.new.brew { (doc+'core-doc').install Dir['*'] } diff --git a/Library/Formula/ioke.rb b/Library/Formula/ioke.rb index 44e749ccf..a89467086 100644 --- a/Library/Formula/ioke.rb +++ b/Library/Formula/ioke.rb @@ -11,7 +11,7 @@ class Ioke <Formula # Point IOKE_HOME to libexec inreplace 'bin/ioke' do |s| - s.change_make_var! 'IOKE_HOME', "#{libexec}" + s.change_make_var! 'IOKE_HOME', libexec end # Install jars in libexec to avoid conflicts diff --git a/Library/Formula/kiwi.rb b/Library/Formula/kiwi.rb index a7912ba3a..70cad6d6c 100644 --- a/Library/Formula/kiwi.rb +++ b/Library/Formula/kiwi.rb @@ -8,7 +8,7 @@ class Kiwi <Formula depends_on 'rlwrap' => :recommended def install - inreplace "Makefile", "/usr/local", "#{prefix}" + inreplace "Makefile", "/usr/local", prefix system "make install" end diff --git a/Library/Formula/liboil.rb b/Library/Formula/liboil.rb index 8c31e5ccf..798548238 100644 --- a/Library/Formula/liboil.rb +++ b/Library/Formula/liboil.rb @@ -10,7 +10,7 @@ class Liboil <Formula def install arch = Hardware.is_64_bit? ? 'x64_64' : 'i386' - inreplace "configure", "__HOST_CPU__", "#{arch}" + inreplace "configure", "__HOST_CPU__", arch system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking" system "make" system "make install" diff --git a/Library/Formula/nu.rb b/Library/Formula/nu.rb index 4893d2af3..a5182beb4 100644 --- a/Library/Formula/nu.rb +++ b/Library/Formula/nu.rb @@ -8,11 +8,13 @@ class Nu <Formula depends_on 'pcre' def install - ENV['PREFIX']="#{prefix}" + ENV['PREFIX'] = prefix + inreplace "Makefile" do |s| cflags = s.get_make_var "CFLAGS" s.change_make_var! "CFLAGS", "#{cflags} #{ENV["CPPFLAGS"]}" end + inreplace "Nukefile" do |s| case Hardware.cpu_type when :intel diff --git a/Library/Formula/rabbitmq.rb b/Library/Formula/rabbitmq.rb index 461ea14be..68e5720c7 100644 --- a/Library/Formula/rabbitmq.rb +++ b/Library/Formula/rabbitmq.rb @@ -35,7 +35,7 @@ class Rabbitmq <Formula # RabbitMQ Erlang binaries are installed in lib/rabbitmq/erlang/lib/rabbitmq-x.y.z/ebin # therefore need to add this path for erl -pa - inreplace sbin+'rabbitmq-env', '${SCRIPT_DIR}/..', "#{target_dir}" + inreplace sbin+'rabbitmq-env', '${SCRIPT_DIR}/..', target_dir end end diff --git a/Library/Formula/rubinius.rb b/Library/Formula/rubinius.rb index 457a4d76a..fae7732e2 100644 --- a/Library/Formula/rubinius.rb +++ b/Library/Formula/rubinius.rb @@ -14,11 +14,11 @@ class Rubinius < Formula # Let Rubinius define its own flags; messing with these causes build breaks. %w{CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS}.each { |e| ENV.delete(e) } - ENV['RELEASE'] = "#{version}" # to fix issues with "path already exists" + ENV['RELEASE'] = version # to fix issues with "path already exists" # "--skip-system" means to use the included LLVM system "./configure", "--skip-system", - "--prefix", "#{prefix}", + "--prefix", prefix, "--includedir", "#{include}/rubinius", "--libdir", lib, "--mandir", man, # For completeness; no manpages exist yet. diff --git a/Library/Formula/tinyproxy.rb b/Library/Formula/tinyproxy.rb index 57011b264..2d60dfe05 100644 --- a/Library/Formula/tinyproxy.rb +++ b/Library/Formula/tinyproxy.rb @@ -9,8 +9,8 @@ class Tinyproxy <Formula def install inreplace 'doc/tinyproxy.conf' do |s| - s.gsub! '/var', "#{var}" - s.gsub! '/usr/share', "#{share}" + s.gsub! '/var', var + s.gsub! '/usr/share', share end system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking" |
