Merge pull request #13067 from Homebrew/any_casks_installed

caskroom: add, use any_casks_installed?.
Homebrew · Mar 30, 2022 · b2f3081 · b2f3081
2 parents 663c0a7 + 61976e0
commit b2f3081
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Library/Homebrew/cask/caskroom.rb b/Library/Homebrew/cask/caskroom.rb
@@ -12,7 +12,14 @@ module Caskroom
 
     sig { returns(Pathname) }
     def self.path
-      @path ||= HOMEBREW_PREFIX.join("Caskroom")
+      @path ||= HOMEBREW_PREFIX/"Caskroom"
+    end
+
+    sig { returns(T::Boolean) }
+    def self.any_casks_installed?
+      return false unless path.exist?
+
+      path.children.select(&:directory?).any?
     end
 
     sig { void }
@@ -36,7 +43,7 @@ def self.ensure_caskroom_exists
     def self.casks(config: nil)
       return [] unless path.exist?
 
-      Pathname.glob(path.join("*")).sort.select(&:directory?).map do |path|
+      path.children.select(&:directory?).sort.map do |path|
         token = path.basename.to_s
 
         if (tap_path = CaskLoader.tap_paths(token).first)

diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
@@ -48,7 +48,7 @@ def doctor
         check_missing_deps
       ]
       methods = (checks.all - slow_checks) + slow_checks
-      methods -= checks.cask_checks if Cask::Caskroom.casks.blank?
+      methods -= checks.cask_checks unless Cask::Caskroom.any_casks_installed?
     else
       methods = args.named
     end

diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
@@ -113,7 +113,7 @@ def list
         ohai "Formulae" if $stdout.tty? && !args.formula?
         safe_system "ls", *ls_args, HOMEBREW_CELLAR
       end
-      if !args.formula? && Cask::Caskroom.casks.any?
+      if !args.formula? && Cask::Caskroom.any_casks_installed?
         if $stdout.tty? && !args.cask?
           puts
           ohai "Casks"