Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
various: automated style fixes
  • Loading branch information
DomT4 committed Aug 18, 2016
1 parent e40c485 commit 431e7b2
Show file tree
Hide file tree
Showing 53 changed files with 80 additions and 95 deletions.
3 changes: 1 addition & 2 deletions Formula/autotrace.rb
Expand Up @@ -31,8 +31,7 @@ def install
args = ["--disable-debug",
"--disable-dependency-tracking",
"--prefix=#{prefix}",
"--mandir=#{man}",
]
"--mandir=#{man}"]

args << "--without-magick" if build.without? "imagemagick"

Expand Down
2 changes: 1 addition & 1 deletion Formula/brotli.rb
Expand Up @@ -14,7 +14,7 @@ class Brotli < Formula

depends_on "cmake" => :build

conflicts_with "bro", because: "Both install a `bro` binary"
conflicts_with "bro", :because => "Both install a `bro` binary"

def install
system "cmake", ".", *std_cmake_args
Expand Down
3 changes: 1 addition & 2 deletions Formula/cgal.rb
Expand Up @@ -40,8 +40,7 @@ def install
args = ["-DCMAKE_INSTALL_PREFIX=#{prefix}",
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON",
"-DCMAKE_INSTALL_NAME_DIR=#{HOMEBREW_PREFIX}/lib",
]
"-DCMAKE_INSTALL_NAME_DIR=#{HOMEBREW_PREFIX}/lib"]
if build.without? "imaging"
args << "-DWITH_CGAL_Qt3=OFF" << "-DWITH_CGAL_Qt4=OFF" << "-DWITH_CGAL_ImageIO=OFF"
end
Expand Down
1 change: 0 additions & 1 deletion Formula/cherokee.rb
Expand Up @@ -18,7 +18,6 @@ class Cherokee < Formula
sha256 "ef4d94b51cc425dd704d0007cf9980024035406cb00345158fd84b1901c04437" => :mavericks
end


head do
url "https://github.com/cherokee/webserver.git"

Expand Down
3 changes: 2 additions & 1 deletion Formula/cloud-watch.rb
Expand Up @@ -11,7 +11,8 @@ class CloudWatch < Formula

def install
env = Language::Java.java_home_env
env.merge! :AWS_CLOUDWATCH_HOME => libexec, :SERVICE_HOME => libexec
env[:AWS_CLOUDWATCH_HOME] = libexec
env[:SERVICE_HOME] = libexec
rm Dir["bin/*.cmd"] # Remove Windows versions
libexec.install Dir["*"]
Pathname.glob("#{libexec}/bin/*") do |file|
Expand Down
2 changes: 1 addition & 1 deletion Formula/ezstream.rb
Expand Up @@ -27,7 +27,7 @@ def install
end

test do
(testpath/"test.m3u").write "#{test_fixtures("test.mp3")}"
(testpath/"test.m3u").write test_fixtures("test.mp3").to_s
system bin/"ezstream", "-s", testpath/"test.m3u"
end
end
3 changes: 2 additions & 1 deletion Formula/falcon.rb
Expand Up @@ -32,7 +32,8 @@ def install
-DFALCON_LIB_DIR=#{lib}
-DFALCON_MAN_DIR=#{man1}
-DFALCON_WITH_INTERNAL_PCRE=OFF
-DFALCON_WITH_MANPAGES=ON]
-DFALCON_WITH_MANPAGES=ON
]

if build.with? "editline"
args << "-DFALCON_WITH_EDITLINE=ON"
Expand Down
3 changes: 1 addition & 2 deletions Formula/ffmbc.rb
Expand Up @@ -39,8 +39,7 @@ def install
"--disable-shared",
"--enable-gpl",
"--enable-nonfree",
"--cc=#{ENV.cc}",
]
"--cc=#{ENV.cc}"]

args << "--enable-libx264" if build.with? "x264"
args << "--enable-libfaac" if build.with? "faac"
Expand Down
3 changes: 1 addition & 2 deletions Formula/fftw.rb
Expand Up @@ -27,8 +27,7 @@ def install
"--disable-debug",
"--prefix=#{prefix}",
"--enable-threads",
"--disable-dependency-tracking",
]
"--disable-dependency-tracking"]
simd_args = ["--enable-sse2"]
simd_args << "--enable-avx" if ENV.compiler == :clang && Hardware::CPU.avx? && !build.bottle?

Expand Down
2 changes: 1 addition & 1 deletion Formula/gearman.rb
Expand Up @@ -45,7 +45,7 @@ def install
"--disable-dependency-tracking",
"--disable-libdrizzle",
"--with-boost=#{Formula["boost"].opt_prefix}",
"--with-sqlite3"
"--with-sqlite3",
]

if build.with? "cyassl"
Expand Down
2 changes: 1 addition & 1 deletion Formula/gnu-time.rb
Expand Up @@ -25,7 +25,7 @@ def install
args = [
"--prefix=#{prefix}",
"--mandir=#{man}",
"--info=#{info}"
"--info=#{info}",
]

args << "--program-prefix=g" if build.without? "default-names"
Expand Down
2 changes: 1 addition & 1 deletion Formula/google-sql-tool.rb
Expand Up @@ -15,6 +15,6 @@ def install
"SQL_SH_DIR=\"#{libexec}\""

libexec.install ["google_sql.sh", "google_sql.jar"]
bin.install_symlink libexec+("google_sql.sh") => "google_sql"
bin.install_symlink libexec+"google_sql.sh" => "google_sql"
end
end
2 changes: 1 addition & 1 deletion Formula/gotags.rb
Expand Up @@ -32,6 +32,6 @@ def install
}
EOS

assert_match (/^Bar.*test.go.*$/), shell_output("#{bin}/gotags #{testpath}/test.go")
assert_match /^Bar.*test.go.*$/, shell_output("#{bin}/gotags #{testpath}/test.go")
end
end
2 changes: 1 addition & 1 deletion Formula/h2.rb
Expand Up @@ -23,7 +23,7 @@ def install
#
# https://github.com/h2database/h2database/issues/218
h2_script = File.read("bin/h2.sh").gsub("\r\n", "\n")
File.open("bin/h2.sh", "w") {|f| f.write h2_script}
File.open("bin/h2.sh", "w") { |f| f.write h2_script }

# Fix the permissions on the script
chmod 0755, "bin/h2.sh"
Expand Down
2 changes: 1 addition & 1 deletion Formula/ipsumdump.rb
Expand Up @@ -19,6 +19,6 @@ def install
end

test do
system "#{bin}/ipsumdump", "-c", "-r", "#{test_fixtures("test.pcap")}"
system "#{bin}/ipsumdump", "-c", "-r", test_fixtures("test.pcap").to_s
end
end
3 changes: 2 additions & 1 deletion Formula/jdnssec-tools.rb
Expand Up @@ -31,7 +31,8 @@ def install
NfIRTFadqsmuU9F ddz3JqCcYwEpWbReg6DJOeyu+9oBoIQkPxFyLtIXEPGlQzrynKubn04
Cx83I6NfzDTraJT3jLHKeW5PVc1ifqKzHz5TXdHHTA7NkJAa0sPcZCoNE 1LpnJI/wcUpRU
iuQhoLFeT1E432GuPuZ7y+agElGj0NnBxEgnHrhrnZW UbULpRa/il+Cr5Taj988HqX9Xdm
6FjcP4Lbuds/44U7U8du224Q8jTrZ 57Yvj4VDQKc=)")
6FjcP4Lbuds/44U7U8du224Q8jTrZ 57Yvj4VDQKc=)"
)

assert_match /D4C3D5552B8679FAEEBC317E5F048B614B2E5F607DC57F1553182D49AB2179F7/,
shell_output("#{bin}/jdnssec-dstool -d 2 powerdns.com.key")
Expand Down
2 changes: 1 addition & 1 deletion Formula/jenkins-job-builder.rb
Expand Up @@ -30,7 +30,7 @@ class JenkinsJobBuilder < Formula

resource "pbr" do
url "https://pypi.python.org/packages/source/p/pbr/pbr-0.11.1.tar.gz"
sha256 "701ab2922c29ca6004e3a4aab968728f33224968de9b51e432be2ee3340c2309"
sha256 "701ab2922c29ca6004e3a4aab968728f33224968de9b51e432be2ee3340c2309"
end

resource "six" do
Expand Down
12 changes: 6 additions & 6 deletions Formula/jless.rb
Expand Up @@ -16,12 +16,12 @@ class Jless < Formula
end

[
%w[258 0681485f47237aeee42a34bbf0ab55215933c7713d1be80ac202a31c7a6fdc31],
%w[258-259 845bb97f407727febd4ee4014618715884bf393d1531089e18faf4e895e19cec],
%w[259-260 e81a5de1fdc276cf0f189c674f37459cf1a7314ac1b804c077e23c519df87ec8],
%w[260-261 b595378ae65a5a7256df3b6279d755d6fdce66ab6ea0bba4f51eeb9ee0307c03],
%w[261-262 e7249de419acc3b8c4a11bed376d778711fd031887d0df0624d62a6d07356842],
%w[262.ext03 82fb77f21ea1f3281224fcbfad073aeab12fb40d6623c9b40698be952401f821]
%w[258 0681485f47237aeee42a34bbf0ab55215933c7713d1be80ac202a31c7a6fdc31],
%w[258-259 845bb97f407727febd4ee4014618715884bf393d1531089e18faf4e895e19cec],
%w[259-260 e81a5de1fdc276cf0f189c674f37459cf1a7314ac1b804c077e23c519df87ec8],
%w[260-261 b595378ae65a5a7256df3b6279d755d6fdce66ab6ea0bba4f51eeb9ee0307c03],
%w[261-262 e7249de419acc3b8c4a11bed376d778711fd031887d0df0624d62a6d07356842],
%w[262.ext03 82fb77f21ea1f3281224fcbfad073aeab12fb40d6623c9b40698be952401f821],
].each do |name, sha|
patch do
url "https://ftp.netbsd.org/pub/pkgsrc/distfiles/less-382-iso#{name}.patch.gz"
Expand Down
4 changes: 2 additions & 2 deletions Formula/l-smash.rb
Expand Up @@ -2,8 +2,8 @@ class LSmash < Formula
desc "Tool for working with MP4 files"
homepage "https://l-smash.github.io/l-smash/"
url "https://github.com/l-smash/l-smash.git", :shallow => false,
:tag => "v2.9.1",
:revision => "4cea08d264933634db5bc06da9d8d88fb5ddae07"
:tag => "v2.9.1",
:revision => "4cea08d264933634db5bc06da9d8d88fb5ddae07"
head "https://github.com/l-smash/l-smash.git"

bottle do
Expand Down
2 changes: 1 addition & 1 deletion Formula/lesspipe.rb
Expand Up @@ -18,7 +18,7 @@ class Lesspipe < Formula

def install
if build.with? "syntax-highlighting"
inreplace "configure", %q($ifsyntax = "\L$ifsyntax";), %q($ifsyntax = "\Ly";)
inreplace "configure", '$ifsyntax = "\L$ifsyntax";', '$ifsyntax = "\Ly";'
end

system "./configure", "--prefix=#{prefix}", "--yes"
Expand Down
2 changes: 1 addition & 1 deletion Formula/lhasa.rb
Expand Up @@ -29,7 +29,7 @@ def install
%w[
31002d6c68302d0400000004000000f59413532002836255050000865a060001666f6f0
50050a4810700511400f5010000666f6f0a00
].join
].join,
].pack("H*")

pipe_output("#{bin}/lha x -", data)
Expand Down
2 changes: 1 addition & 1 deletion Formula/libetonyek.rb
Expand Up @@ -27,7 +27,7 @@ def install
ENV.prepend_path "PATH", Formula["gnu-sed"].opt_libexec/"gnubin"
system "./configure", "--prefix=#{libexec}", "--enable-modules=no"
system "make"
system "make install"
system "make", "install"
end

ENV["LANGTAG_CFLAGS"] = "-I#{libexec}/include"
Expand Down
2 changes: 1 addition & 1 deletion Formula/libgraphqlparser.rb
Expand Up @@ -47,7 +47,7 @@ def install
{ "kind"=>"Name", "loc"=>{ "start"=>3, "end"=>7 }, "value"=>"user" },
"arguments"=>nil,
"directives"=>nil,
"selectionSet"=>nil, }], }, }], }
"selectionSet"=>nil }] } }] }

test_ast = Utils::JSON.load pipe_output("#{libexec}/dump_json_ast", sample_query)
assert_equal sample_ast, test_ast
Expand Down
6 changes: 3 additions & 3 deletions Formula/libgxps.rb
Expand Up @@ -37,7 +37,7 @@ def install
"--disable-dependency-tracking",
"--disable-silent-rules",
"--enable-man",
"--prefix=#{prefix}"
"--prefix=#{prefix}",
]

args << "--without-libjpeg" if build.without? "libjpeg"
Expand All @@ -56,7 +56,7 @@ def install
test do
mkdir_p [
(testpath/"Documents/1/Pages/_rels/"),
(testpath/"_rels/")
(testpath/"_rels/"),
]

(testpath/"FixedDocumentSequence.fdseq").write <<-EOS.undent
Expand All @@ -80,7 +80,7 @@ def install
[
"_rels/FixedDocumentSequence.fdseq.rels",
"Documents/1/_rels/FixedDocument.fdoc.rels",
"Documents/1/Pages/_rels/1.fpage.rels"
"Documents/1/Pages/_rels/1.fpage.rels",
].each do |f|
(testpath/f).write <<-EOS.undent
<Relationships />
Expand Down
2 changes: 1 addition & 1 deletion Formula/libhttpserver.rb
Expand Up @@ -28,7 +28,7 @@ def install
args = [
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"
"--prefix=#{prefix}",
]

system "./bootstrap"
Expand Down
4 changes: 2 additions & 2 deletions Formula/libid3tag.rb
Expand Up @@ -18,7 +18,7 @@ class Libid3tag < Formula
"utf16.patchlibid3tag-0.15.1b-utf16" => "487d0c531f3653f8e754d720729cf1cec1bce6e897b845fa61adaaf2668d1568",
"unknown-encoding" => "8b695c9c05e3885655b2e798326b804011615bc6c831cd55cdbacc456a6b9494",
"compat" => "88f486c3d263a4dd5bb556232dcfe2fba175b5124bcdd72aa6c30f562fc87d53",
"file-write" => "eff855cabd8a51866a29246a1b257da64f46aab72d4b8e163e2a4c0d15165bf1"
"file-write" => "eff855cabd8a51866a29246a1b257da64f46aab72d4b8e163e2a4c0d15165bf1",
}.each do |name, sha|
patch do
url "http://mirror.ovh.net/gentoo-portage/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-#{name}.patch"
Expand All @@ -30,7 +30,7 @@ class Libid3tag < Formula
{
"64bit-long" => "5f8b3d3419addf90977832b0a6e563acc2c8e243bb826ebb6d0ec573ec122e1b",
"fix_overflow" => "43ea3e0b324fb25802dae6410564c947ce1982243c781ef54b023f060c3b0ac4",
"tag" => "ca7262ddad158ab0be804429d705f8c6a1bb120371dec593323fa4876c1b277f"
"tag" => "ca7262ddad158ab0be804429d705f8c6a1bb120371dec593323fa4876c1b277f",
}.each do |name, sha|
patch :p0 do
url "http://mirror.ovh.net/gentoo-portage/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-#{name}.patch"
Expand Down
2 changes: 1 addition & 1 deletion Formula/liblwgeom.rb
Expand Up @@ -54,7 +54,7 @@ def install
"--without-libiconv-prefix",
"--without-libintl-prefix",
"--without-raster", # this ensures gdal is not required
"--without-topology"
"--without-topology",
]

if build.head?
Expand Down
1 change: 0 additions & 1 deletion Formula/libmaa.rb
Expand Up @@ -22,4 +22,3 @@ def install
system "make", "install"
end
end

1 change: 0 additions & 1 deletion Formula/librevenge.rb
Expand Up @@ -15,7 +15,6 @@ class Librevenge < Formula
depends_on "pkg-config" => :build
depends_on "boost"


def install
system "./configure", "--without-docs",
"--disable-dependency-tracking",
Expand Down
3 changes: 1 addition & 2 deletions Formula/libxmlsec1.rb
Expand Up @@ -26,8 +26,7 @@ def install
args = ["--disable-dependency-tracking",
"--prefix=#{prefix}",
"--disable-crypto-dl",
"--disable-apps-crypto-dl"
]
"--disable-apps-crypto-dl"]

args << "--with-openssl=#{Formula["openssl"].opt_prefix}" if build.with? "openssl"
args << "--with-libxml=#{Formula["libxml2"].opt_prefix}" if build.with? "libxml2"
Expand Down
2 changes: 1 addition & 1 deletion Formula/lightning.rb
Expand Up @@ -19,7 +19,7 @@ def install
args = [
"--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}"
"--prefix=#{prefix}",
]
args << "--disable-disassembler" if build.without? "binutils"

Expand Down
3 changes: 1 addition & 2 deletions Formula/mapnik.rb
Expand Up @@ -70,8 +70,7 @@ def install
"FREETYPE_CONFIG=#{freetype}/bin/freetype-config",
"NIK2IMG=False",
"CPP_TESTS=False", # too long to compile to be worth it
"INPUT_PLUGINS=all",
]
"INPUT_PLUGINS=all"]

if build.with? "cairo"
args << "CAIRO=True" # cairo paths will come from pkg-config
Expand Down
2 changes: 1 addition & 1 deletion Formula/mawk.rb
Expand Up @@ -25,6 +25,6 @@ def install
test do
version=`mawk '/version/ { print $2 }' #{prefix}/README`
assert_equal 0, $?.exitstatus
assert_equal version, "#{version}"
assert_equal version, version.to_s
end
end
3 changes: 2 additions & 1 deletion Formula/modules.rb
Expand Up @@ -22,7 +22,8 @@ def install
--prefix=#{prefix}
--datarootdir=#{share}
--disable-versioning
CPPFLAGS=-DUSE_INTERP_ERRORLINE]
CPPFLAGS=-DUSE_INTERP_ERRORLINE
]
args << "--without-x" if build.without? "x11"
system "./configure", *args
system "make", "install"
Expand Down
1 change: 0 additions & 1 deletion Formula/mp3gain.rb
Expand Up @@ -17,4 +17,3 @@ def install
bin.install "mp3gain"
end
end

5 changes: 2 additions & 3 deletions Formula/nailgun.rb
Expand Up @@ -47,9 +47,9 @@ class Nailgun < Formula
def install
system "make", "install", "CC=#{ENV.cc}", "PREFIX=#{prefix}", "CFLAGS=#{ENV.cflags}"
if build.head?
require 'rexml/document'
require "rexml/document"
pom_xml = REXML::Document.new(File.new("pom.xml"))
jar_version = REXML::XPath.first(pom_xml, "string(/pom:project/pom:version)", "pom" => "http://maven.apache.org/POM/4.0.0")
jar_version = REXML::XPath.first(pom_xml, "string(/pom:project/pom:version)", "pom" => "https://maven.apache.org/POM/4.0.0")
system "mvn", "clean", "install"
libexec.install Dir["nailgun-server/target/*.jar"]
else
Expand All @@ -68,4 +68,3 @@ def install
true
end
end

2 changes: 1 addition & 1 deletion Formula/ne.rb
Expand Up @@ -20,7 +20,7 @@ def install
ENV["TERM"] = "xterm"
(testpath/"test.txt").write("This is a test document.\n")
(testpath/"test_ne").write("GotoLine 2\nInsertString line 2\nExit\n")
system "script", "-q", "/dev/null", "#{bin}/ne", "--macro", "#{(testpath/"test_ne")}", "#{(testpath/"test.txt")}"
system "script", "-q", "/dev/null", "#{bin}/ne", "--macro", ((testpath/"test_ne")).to_s, ((testpath/"test.txt")).to_s
assert_equal "This is a test document.\nline 2", File.read("#{testpath}/test.txt")
end
end
2 changes: 1 addition & 1 deletion Formula/netpbm.rb
Expand Up @@ -65,7 +65,7 @@ def install
end

test do
system ("#{bin}/pngtopam #{test_fixtures("test.png")} -alphapam >> test.pam")
system "#{bin}/pngtopam #{test_fixtures("test.png")} -alphapam >> test.pam"
system "#{bin}/pamdice", "test.pam", "-outstem", "#{testpath}/testing"
assert File.exist?("testing_0_0.")
end
Expand Down

0 comments on commit 431e7b2

Please sign in to comment.