Look for container extraction programs in PATH.

4 files changed, 6 insertions, 14 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/container/cab.rb b/Library/Homebrew/cask/lib/hbc/container/cab.rb
index d32b1b205..7ae6b0632 100644
--- a/Library/Homebrew/cask/lib/hbc/container/cab.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/cab.rb
@@ -6,17 +6,15 @@ module Hbc
   class Container
     class Cab < Base
       def self.me?(criteria)
-        cabextract = Hbc.homebrew_prefix.join("bin", "cabextract")
+        cabextract = which("cabextract")
 
         criteria.magic_number(%r{^MSCF}n) &&
-          cabextract.exist? &&
+          !cabextract.nil? &&
           criteria.command.run(cabextract, args: ["-t", "--", criteria.path.to_s]).stderr.empty?
       end
 
       def extract
-        cabextract = Hbc.homebrew_prefix.join("bin", "cabextract")
-
-        unless cabextract.exist?
+        if (cabextract = which("cabextract")).nil?
           raise CaskError, "Expected to find cabextract executable. Cask '#{@cask}' must add: depends_on formula: 'cabextract'"
         end
 
diff --git a/Library/Homebrew/cask/lib/hbc/container/generic_unar.rb b/Library/Homebrew/cask/lib/hbc/container/generic_unar.rb
index 32bbc8d15..5fa0dbdce 100644
--- a/Library/Homebrew/cask/lib/hbc/container/generic_unar.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/generic_unar.rb
@@ -14,9 +14,7 @@ module Hbc
       end
 
       def extract
-        unar = Hbc.homebrew_prefix.join("bin", "unar")
-
-        unless unar.exist?
+        if (unar = which("unar")).nil?
           raise CaskError, "Expected to find unar executable. Cask #{@cask} must add: depends_on formula: 'unar'"
         end
 
diff --git a/Library/Homebrew/cask/lib/hbc/container/lzma.rb b/Library/Homebrew/cask/lib/hbc/container/lzma.rb
index a91132b55..cca4d814b 100644
--- a/Library/Homebrew/cask/lib/hbc/container/lzma.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/lzma.rb
@@ -10,9 +10,7 @@ module Hbc
       end
 
       def extract
-        unlzma = Hbc.homebrew_prefix.join("bin", "unlzma")
-
-        unless unlzma.exist?
+        if (unlzma = which("unlzma")).nil?
           raise CaskError, "Expected to find unlzma executable. Cask '#{@cask}' must add: depends_on formula: 'lzma'"
         end
 
diff --git a/Library/Homebrew/cask/lib/hbc/container/xz.rb b/Library/Homebrew/cask/lib/hbc/container/xz.rb
index 831bef5aa..fc0ae064e 100644
--- a/Library/Homebrew/cask/lib/hbc/container/xz.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/xz.rb
@@ -10,9 +10,7 @@ module Hbc
       end
 
       def extract
-        unxz = Hbc.homebrew_prefix.join("bin", "unxz")
-
-        unless unxz.exist?
+        if (unxz = which("unxz")).nil?
           raise CaskError, "Expected to find unxz executable. Cask '#{@cask}' must add: depends_on formula: 'xz'"
         end