From 458a1e7903360dde98896a29a48420911cf59193 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sat, 9 Jun 2018 09:01:09 +0200
Subject: [PATCH] Remove `Locations` module.

---
 Library/Homebrew/cask/lib/hbc/installer.rb       | 8 ++++----
 Library/Homebrew/cask/lib/hbc/locations.rb       | 8 --------
 Library/Homebrew/os/mac.rb                       | 8 ++++++++
 Library/Homebrew/test/cask/accessibility_spec.rb | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index a2833e8f9a..90e4c286d4 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -292,19 +292,19 @@ module Hbc
       ohai "Enabling accessibility access"
       if MacOS.version <= :mountain_lion
         @command.run!("/usr/bin/touch",
-                      args: [Hbc.pre_mavericks_accessibility_dotfile],
+                      args: [MacOS.pre_mavericks_accessibility_dotfile],
                       sudo: true)
       elsif MacOS.version <= :yosemite
         @command.run!("/usr/bin/sqlite3",
                       args: [
-                        Hbc.tcc_db,
+                        MacOS.tcc_db,
                         "INSERT OR REPLACE INTO access VALUES('kTCCServiceAccessibility','#{bundle_identifier}',0,1,1,NULL);",
                       ],
                       sudo: true)
       elsif MacOS.version <= :el_capitan
         @command.run!("/usr/bin/sqlite3",
                       args: [
-                        Hbc.tcc_db,
+                        MacOS.tcc_db,
                         "INSERT OR REPLACE INTO access VALUES('kTCCServiceAccessibility','#{bundle_identifier}',0,1,1,NULL,NULL);",
                       ],
                       sudo: true)
@@ -325,7 +325,7 @@ module Hbc
         ohai "Disabling accessibility access"
         @command.run!("/usr/bin/sqlite3",
                       args: [
-                        Hbc.tcc_db,
+                        MacOS.tcc_db,
                         "DELETE FROM access WHERE client='#{bundle_identifier}';",
                       ],
                       sudo: true)
diff --git a/Library/Homebrew/cask/lib/hbc/locations.rb b/Library/Homebrew/cask/lib/hbc/locations.rb
index 4e1bafc94f..0b8dd7f646 100644
--- a/Library/Homebrew/cask/lib/hbc/locations.rb
+++ b/Library/Homebrew/cask/lib/hbc/locations.rb
@@ -19,14 +19,6 @@ module Hbc
       def default_tap
         @default_tap ||= Tap.fetch("homebrew", "homebrew-cask")
       end
-
-      def tcc_db
-        @tcc_db ||= Pathname.new("/Library/Application Support/com.apple.TCC/TCC.db")
-      end
-
-      def pre_mavericks_accessibility_dotfile
-        @pre_mavericks_accessibility_dotfile ||= Pathname.new("/private/var/db/.AccessibilityAPIEnabled")
-      end
     end
   end
 end
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 0e862cffb5..bbdd032e8a 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -255,5 +255,13 @@ module OS
     def mdfind_query(*ids)
       ids.map! { |id| "kMDItemCFBundleIdentifier == #{id}" }.join(" || ")
     end
+
+    def tcc_db
+      @tcc_db ||= Pathname.new("/Library/Application Support/com.apple.TCC/TCC.db")
+    end
+
+    def pre_mavericks_accessibility_dotfile
+      @pre_mavericks_accessibility_dotfile ||= Pathname.new("/private/var/db/.AccessibilityAPIEnabled")
+    end
   end
 end
diff --git a/Library/Homebrew/test/cask/accessibility_spec.rb b/Library/Homebrew/test/cask/accessibility_spec.rb
index 8832ed8d16..26613aa20c 100644
--- a/Library/Homebrew/test/cask/accessibility_spec.rb
+++ b/Library/Homebrew/test/cask/accessibility_spec.rb
@@ -16,7 +16,7 @@ describe "Accessibility Access", :cask do
     it "can enable accessibility access in macOS releases prior to Mavericks" do
       expect(fake_system_command).to receive(:run!).with(
         "/usr/bin/touch",
-        args: [Hbc.pre_mavericks_accessibility_dotfile],
+        args: [MacOS.pre_mavericks_accessibility_dotfile],
         sudo: true,
       )
 
@@ -36,7 +36,7 @@ describe "Accessibility Access", :cask do
     it "can enable accessibility access" do
       expect(fake_system_command).to receive(:run!).with(
         "/usr/bin/sqlite3",
-        args: [Hbc.tcc_db, "INSERT OR REPLACE INTO access VALUES('kTCCServiceAccessibility','com.example.BasicCask',0,1,1,NULL);"],
+        args: [MacOS.tcc_db, "INSERT OR REPLACE INTO access VALUES('kTCCServiceAccessibility','com.example.BasicCask',0,1,1,NULL);"],
         sudo: true,
       )
 
@@ -46,7 +46,7 @@ describe "Accessibility Access", :cask do
     it "can disable accessibility access" do
       expect(fake_system_command).to receive(:run!).with(
         "/usr/bin/sqlite3",
-        args: [Hbc.tcc_db, "DELETE FROM access WHERE client='com.example.BasicCask';"],
+        args: [MacOS.tcc_db, "DELETE FROM access WHERE client='com.example.BasicCask';"],
         sudo: true,
       )