edits

2 files changed, 4 insertions, 4 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
index d2feb1e06..7ee861508 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
@@ -166,7 +166,7 @@ class Hbc::CLI::Doctor < Hbc::CLI::Base
   # where "doctor" is needed is precisely the situation where such
   # things are less dependable.
   def self.render_install_location
-    locations = Dir.glob(homebrew_cellar.join("brew-cask", "*")).reverse
+    locations = Dir.glob(Pathname.new(homebrew_cellar).join("brew-cask", "*")).reverse
     if locations.empty?
       none_string
     else
diff --git a/Library/Homebrew/cask/lib/hbc/macos.rb b/Library/Homebrew/cask/lib/hbc/macos.rb
index 46047f413..5e25c657e 100644
--- a/Library/Homebrew/cask/lib/hbc/macos.rb
+++ b/Library/Homebrew/cask/lib/hbc/macos.rb
@@ -361,17 +361,17 @@ module OS::Mac
                        "~/Library/Widgets",
                        "~/Library/Workflows",
                      ]
-                     .map { |x| Pathname(x).expand_path }
+                     .map { |x| Pathname(x.sub(%r{^~(?=(/|$))}, Dir.home)).expand_path }
                      .to_set
                      .union(SYSTEM_DIRS)
                      .freeze
 
   def system_dir?(dir)
-    SYSTEM_DIRS.any? { |u| File.identical?(u, dir) }
+    SYSTEM_DIRS.include?(Pathname.new(dir).expand_path)
   end
 
   def undeletable?(dir)
-    UNDELETABLE_DIRS.any? { |u| File.identical?(u, dir) }
+    UNDELETABLE_DIRS.include?(Pathname.new(dir).expand_path)
   end
 
   alias release version