tuntap_requirement: fix binary logic.
Previously this was only using the last line.
This commit is contained in:
parent
07d904fdb5
commit
5413ddcb65
@ -7,8 +7,11 @@ class TuntapRequirement < Requirement
|
|||||||
satisfy(:build_env => false) { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? }
|
satisfy(:build_env => false) { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? }
|
||||||
|
|
||||||
def self.binary_tuntap_installed?
|
def self.binary_tuntap_installed?
|
||||||
File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext")
|
%w[
|
||||||
File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tun.plist")
|
/Library/Extensions/tun.kext
|
||||||
File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tap.plist")
|
/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
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user