diff options
| author | Dominyk Tiller | 2015-02-13 18:48:02 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-13 19:32:15 +0000 |
| commit | 75d0a0e33d837b2a56c2412478f93582688d137a (patch) | |
| tree | 2d72058d7311b664ac4ce64e9912c0222b3492e6 /Library | |
| parent | 6c80ff5c1a89b3943304468326bb520e908f922c (diff) | |
| download | homebrew-75d0a0e33d837b2a56c2412478f93582688d137a.tar.bz2 | |
slimerjs: adapt requirement for simplicity
Re #36635
Closes #36798.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/slimerjs.rb | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Library/Formula/slimerjs.rb b/Library/Formula/slimerjs.rb index e9ec7dea5..d2fa7e396 100644 --- a/Library/Formula/slimerjs.rb +++ b/Library/Formula/slimerjs.rb @@ -1,5 +1,6 @@ class FirefoxDependency < Requirement fatal true + default_formula "xulrunner" if MacOS.version < :yosemite def self.firefox_installation paths = ["~/Applications/FirefoxNightly.app", "~/Applications/Firefox.app", @@ -7,10 +8,10 @@ class FirefoxDependency < Requirement paths.find { |p| File.exist? File.expand_path(p) } end - satisfy { FirefoxDependency.firefox_installation } + satisfy { Formula["xulrunner"].installed? || FirefoxDependency.firefox_installation } def message - "Firefox must be installed unless building with xulrunner" + "Firefox or xulrunner must be available." end end @@ -30,15 +31,7 @@ class Slimerjs < Formula # Min supported OS X version by Firefox & xulrunner is 10.6 depends_on :macos => :leopard - - # xulrunner will not currently build on Yosemite. - if MacOS.version >= :yosemite - depends_on FirefoxDependency - elsif build.with? "xulrunner" - depends_on "xulrunner" - else - depends_on FirefoxDependency - end + depends_on FirefoxDependency def install cd "src" do |