Merge pull request #10945 from carlocab/ls-cask
cmd/list: always use `ls` when no named args are passed
This commit is contained in:
		
						commit
						c65a392d47
					
				@ -45,18 +45,19 @@ module Homebrew
 | 
			
		||||
             description: "Force output to be one entry per line. " \
 | 
			
		||||
                          "This is the default when output is not to a terminal."
 | 
			
		||||
      switch "-l",
 | 
			
		||||
             depends_on:  "--formula",
 | 
			
		||||
             description: "List formulae in long format."
 | 
			
		||||
             description: "List formulae and/or casks in long format. " \
 | 
			
		||||
                          "Has no effect when a formula or cask name is passed as an argument."
 | 
			
		||||
      switch "-r",
 | 
			
		||||
             depends_on:  "--formula",
 | 
			
		||||
             description: "Reverse the order of the formulae sort to list the oldest entries first."
 | 
			
		||||
             description: "Reverse the order of the formulae and/or casks sort to list the oldest entries first. " \
 | 
			
		||||
                          "Has no effect when a formula or cask name is passed as an argument."
 | 
			
		||||
      switch "-t",
 | 
			
		||||
             depends_on:  "--formula",
 | 
			
		||||
             description: "Sort formulae by time modified, listing most recently modified first."
 | 
			
		||||
             description: "Sort formulae and/or casks by time modified, listing most recently modified first. " \
 | 
			
		||||
                          "Has no effect when a formula or cask name is passed as an argument."
 | 
			
		||||
 | 
			
		||||
      conflicts "--formula", "--cask"
 | 
			
		||||
      conflicts "--full-name", "--versions"
 | 
			
		||||
      conflicts "--pinned", "--multiple"
 | 
			
		||||
      conflicts "--pinned", "--cask"
 | 
			
		||||
      conflicts "--cask", "--multiple"
 | 
			
		||||
      ["--formula", "--cask", "--full-name", "--versions", "--pinned"].each do |flag|
 | 
			
		||||
        conflicts "--unbrewed", flag
 | 
			
		||||
@ -68,7 +69,6 @@ module Homebrew
 | 
			
		||||
      end
 | 
			
		||||
      ["--pinned", "-l", "-r", "-t"].each do |flag|
 | 
			
		||||
        conflicts "--full-name", flag
 | 
			
		||||
        conflicts "--cask", flag
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      named_args [:installed_formula, :installed_cask]
 | 
			
		||||
@ -126,7 +126,7 @@ module Homebrew
 | 
			
		||||
          puts
 | 
			
		||||
          ohai "Casks"
 | 
			
		||||
        end
 | 
			
		||||
        list_casks(args: args)
 | 
			
		||||
        safe_system "ls", *ls_args, Cask::Caskroom.path
 | 
			
		||||
      end
 | 
			
		||||
    elsif args.verbose? || !$stdout.tty?
 | 
			
		||||
      system_command! "find", args: args.named.to_kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user