From 5413ddcb6557f1ceb3fbc9bcf28b4cf65ca1c218 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 10 Jul 2016 13:53:37 +0100 Subject: [PATCH] tuntap_requirement: fix binary logic. Previously this was only using the last line. --- Library/Homebrew/requirements/tuntap_requirement.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/requirements/tuntap_requirement.rb b/Library/Homebrew/requirements/tuntap_requirement.rb index 595e46d0d8..0c66a115f5 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