Support Tap#cask_files when using API.
				
					
				
			This commit is contained in:
		
							parent
							
								
									28ad3f7fec
								
							
						
					
					
						commit
						4cf0f79368
					
				@ -936,25 +936,17 @@ module Homebrew
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      def check_cask_taps
 | 
			
		||||
        default_cask_tap = CoreCaskTap.instance
 | 
			
		||||
        taps = Tap.select { |t| t.cask_dir.exist? && t != default_cask_tap }
 | 
			
		||||
        taps.prepend(default_cask_tap) if EnvConfig.no_install_from_api?
 | 
			
		||||
 | 
			
		||||
        error_tap_paths = []
 | 
			
		||||
 | 
			
		||||
        add_info "Homebrew Cask Taps:", (taps.map do |tap|
 | 
			
		||||
          if tap.path.blank?
 | 
			
		||||
            none_string
 | 
			
		||||
          else
 | 
			
		||||
            cask_count = begin
 | 
			
		||||
              tap.cask_files.count
 | 
			
		||||
            rescue
 | 
			
		||||
              error_tap_paths << tap.path
 | 
			
		||||
              0
 | 
			
		||||
            end
 | 
			
		||||
 | 
			
		||||
            "#{tap.path} (#{Utils.pluralize("cask", cask_count, include_count: true)})"
 | 
			
		||||
        add_info "Homebrew Cask Taps:", (Tap.map do |tap|
 | 
			
		||||
          cask_count = begin
 | 
			
		||||
            tap.cask_files.count
 | 
			
		||||
          rescue
 | 
			
		||||
            error_tap_paths << tap.path
 | 
			
		||||
            0
 | 
			
		||||
          end
 | 
			
		||||
 | 
			
		||||
          "#{tap.path} (#{Utils.pluralize("cask", cask_count, include_count: true)})"
 | 
			
		||||
        end)
 | 
			
		||||
 | 
			
		||||
        taps_string = Utils.pluralize("tap", error_tap_paths.count)
 | 
			
		||||
 | 
			
		||||
@ -1198,9 +1198,9 @@ class CoreCaskTap < AbstractCoreTap
 | 
			
		||||
 | 
			
		||||
  sig { override.returns(T::Array[Pathname]) }
 | 
			
		||||
  def cask_files
 | 
			
		||||
    return super if Homebrew::EnvConfig.no_install_from_api? || installed?
 | 
			
		||||
    return super if Homebrew::EnvConfig.no_install_from_api?
 | 
			
		||||
 | 
			
		||||
    raise TapUnavailableError, name
 | 
			
		||||
    cask_files_by_name.values
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  sig { override.returns(T::Array[String]) }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user