aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/build.rb
diff options
context:
space:
mode:
authorBrewTestBot2015-08-03 13:09:07 +0100
committerMike McQuaid2015-08-03 13:22:35 +0100
commit13d544e11e92ba8ea3788723432046f8dfe4adf9 (patch)
treee6da18436d9ce956e6fbe80e3185c67cf3b58808 /Library/Homebrew/build.rb
parent3b68215be793774fafd9ce124a2065f5968f50e5 (diff)
downloadbrew-13d544e11e92ba8ea3788723432046f8dfe4adf9.tar.bz2
Core files style updates.
Closes Homebrew/homebrew#42354. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/build.rb')
-rw-r--r--Library/Homebrew/build.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 42c3e16f4..8442801a7 100644
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -81,7 +81,7 @@ class Build
if superenv?
ENV.keg_only_deps = keg_only_deps
ENV.deps = deps.map(&:to_formula)
- ENV.x11 = reqs.any? { |rq| rq.kind_of?(X11Requirement) }
+ ENV.x11 = reqs.any? { |rq| rq.is_a?(X11Requirement) }
ENV.setup_build_environment(formula)
post_superenv_hacks
reqs.each(&:modify_build_environment)
@@ -148,12 +148,12 @@ class Build
keg.detect_cxx_stdlibs(:skip_executables => true)
end
- def fixopt f
- path = if f.linked_keg.directory? and f.linked_keg.symlink?
+ def fixopt(f)
+ path = if f.linked_keg.directory? && f.linked_keg.symlink?
f.linked_keg.resolved_path
elsif f.prefix.directory?
f.prefix
- elsif (kids = f.rack.children).size == 1 and kids.first.directory?
+ elsif (kids = f.rack.children).size == 1 && kids.first.directory?
kids.first
else
raise