caskroom: add, use any_casks_installed?.
Add a new method for the two places we're checking if we have any casks installed. This is much more performance and user friendly than attempting to load every cask. Fixes #13027
This commit is contained in:
parent
663c0a713a
commit
61976e0672
@ -12,7 +12,14 @@ module Cask
|
|||||||
|
|
||||||
sig { returns(Pathname) }
|
sig { returns(Pathname) }
|
||||||
def self.path
|
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
|
end
|
||||||
|
|
||||||
sig { void }
|
sig { void }
|
||||||
@ -36,7 +43,7 @@ module Cask
|
|||||||
def self.casks(config: nil)
|
def self.casks(config: nil)
|
||||||
return [] unless path.exist?
|
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
|
token = path.basename.to_s
|
||||||
|
|
||||||
if (tap_path = CaskLoader.tap_paths(token).first)
|
if (tap_path = CaskLoader.tap_paths(token).first)
|
||||||
|
|||||||
@ -48,7 +48,7 @@ module Homebrew
|
|||||||
check_missing_deps
|
check_missing_deps
|
||||||
]
|
]
|
||||||
methods = (checks.all - slow_checks) + slow_checks
|
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
|
else
|
||||||
methods = args.named
|
methods = args.named
|
||||||
end
|
end
|
||||||
|
|||||||
@ -113,7 +113,7 @@ module Homebrew
|
|||||||
ohai "Formulae" if $stdout.tty? && !args.formula?
|
ohai "Formulae" if $stdout.tty? && !args.formula?
|
||||||
safe_system "ls", *ls_args, HOMEBREW_CELLAR
|
safe_system "ls", *ls_args, HOMEBREW_CELLAR
|
||||||
end
|
end
|
||||||
if !args.formula? && Cask::Caskroom.casks.any?
|
if !args.formula? && Cask::Caskroom.any_casks_installed?
|
||||||
if $stdout.tty? && !args.cask?
|
if $stdout.tty? && !args.cask?
|
||||||
puts
|
puts
|
||||||
ohai "Casks"
|
ohai "Casks"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user