Merge pull request #1538 from reitermarkus/remove-kexts

Remove kernel extensions specified in `uninstall :kext`.

3 files changed, 20 insertions, 0 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/uninstall_base.rb b/Library/Homebrew/cask/lib/hbc/artifact/uninstall_base.rb
index e76561e92..6d4d329ec 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/uninstall_base.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/uninstall_base.rb
@@ -187,6 +187,10 @@ module Hbc
             @command.run!("/sbin/kextunload", args: ["-b", kext], sudo: true)
             sleep 1
           end
+          @command.run!("/usr/sbin/kextfind", args: ["-b", kext], sudo: true).stdout.chomp.lines.each do |kext_path|
+            ohai "Removing kernel extension #{kext_path}"
+            @command.run!("/bin/rm", args: ["-rf", kext_path], sudo: true)
+          end
         end
       end
 
diff --git a/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb b/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb
index 10c51420a..b9c5c3187 100644
--- a/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb
@@ -192,6 +192,14 @@ describe Hbc::Artifact::Uninstall do
           sudo(%W[/sbin/kextunload -b #{kext_id}])
         )
 
+        Hbc::FakeSystemCommand.expects_command(
+          sudo(%W[/usr/sbin/kextfind -b #{kext_id}]), "/Library/Extensions/FancyPackage.kext\n"
+        )
+
+        Hbc::FakeSystemCommand.expects_command(
+          sudo(["/bin/rm", "-rf", "/Library/Extensions/FancyPackage.kext"])
+        )
+
         subject
       end
     end
diff --git a/Library/Homebrew/cask/test/cask/artifact/zap_test.rb b/Library/Homebrew/cask/test/cask/artifact/zap_test.rb
index 3291afbca..fbbf520a0 100644
--- a/Library/Homebrew/cask/test/cask/artifact/zap_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/zap_test.rb
@@ -193,6 +193,14 @@ describe Hbc::Artifact::Zap do
           sudo(%W[/sbin/kextunload -b #{kext_id}])
         )
 
+        Hbc::FakeSystemCommand.expects_command(
+          sudo(%W[/usr/sbin/kextfind -b #{kext_id}]), "/Library/Extensions/FancyPackage.kext\n"
+        )
+
+        Hbc::FakeSystemCommand.expects_command(
+          sudo(["/bin/rm", "-rf", "/Library/Extensions/FancyPackage.kext"])
+        )
+
         subject
       end
     end