diff options
| author | Mike McQuaid | 2016-07-10 13:53:37 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-07-11 09:05:40 +0100 |
| commit | 5413ddcb6557f1ceb3fbc9bcf28b4cf65ca1c218 (patch) | |
| tree | 50ba44c0e337f39680aa8a55f8604195ea895b61 /Library | |
| parent | 07d904fdb56fc8ebfca743dbf9219348f95551c6 (diff) | |
| download | brew-5413ddcb6557f1ceb3fbc9bcf28b4cf65ca1c218.tar.bz2 | |
tuntap_requirement: fix binary logic.
Previously this was only using the last line.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/requirements/tuntap_requirement.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Library/Homebrew/requirements/tuntap_requirement.rb b/Library/Homebrew/requirements/tuntap_requirement.rb index 595e46d0d..0c66a115f 100644 --- a/Library/Homebrew/requirements/tuntap_requirement.rb +++ b/Library/Homebrew/requirements/tuntap_requirement.rb @@ -7,8 +7,11 @@ class TuntapRequirement < Requirement satisfy(:build_env => false) { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? } def self.binary_tuntap_installed? - File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext") - File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tun.plist") - File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tap.plist") + %w[ + /Library/Extensions/tun.kext + /Library/Extensions/tap.kext + /Library/LaunchDaemons/net.sf.tuntaposx.tun.plist + /Library/LaunchDaemons/net.sf.tuntaposx.tap.plist + ].all? { |file| File.exist?(file) } end end |
