From cd63241558cf57aaeecc81cdd44eba622e4a4805 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Mon, 20 Oct 2014 11:18:17 -0400 Subject: [PATCH] use "staged" instead of "installed" for Caskroom refs: #6783 --- USAGE.md | 2 +- doc/src/brew-cask.1.md | 2 +- lib/cask/cli/list.rb | 2 +- lib/cask/installer.rb | 2 +- test/cask/cli/install_test.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/USAGE.md b/USAGE.md index bef4c5b2bace..69aff530d723 100644 --- a/USAGE.md +++ b/USAGE.md @@ -78,7 +78,7 @@ more information. ## Other Commands * `info` -- displays information about the given Cask -* `list` -- with no args, lists installed Casks; given installed Casks, lists installed files +* `list` -- with no args, lists installed Casks; given installed Casks, lists staged files * `fetch` -- downloads Cask resources to local cache (with `--force`, re-download even if already cached) * `doctor` -- checks for configuration issues * `cleanup` -- cleans up cached downloads (with `--outdated`, only cleans old downloads) diff --git a/doc/src/brew-cask.1.md b/doc/src/brew-cask.1.md index fce9a191c0ba..2452bfba92b2 100644 --- a/doc/src/brew-cask.1.md +++ b/doc/src/brew-cask.1.md @@ -85,7 +85,7 @@ names, and other aspects of this manual are still subject to change. format the output in a single column. With `-l`, give a more detailed listing. - If are given, list the installed files for . + If are given, list the staged files for . * `uninstall [--force]` or `rm` or `remove` : Uninstall . With `--force`, uninstall even if the Cask does diff --git a/lib/cask/cli/list.rb b/lib/cask/cli/list.rb index 8596c6ee6b09..a203b44dd591 100644 --- a/lib/cask/cli/list.rb +++ b/lib/cask/cli/list.rb @@ -62,6 +62,6 @@ def self.list_installed end def self.help - "with no args, lists installed Casks; given installed Casks, lists installed files" + "with no args, lists installed Casks; given installed Casks, lists staged files" end end diff --git a/lib/cask/installer.rb b/lib/cask/installer.rb index ef89a7a0e227..12296db4f1d7 100644 --- a/lib/cask/installer.rb +++ b/lib/cask/installer.rb @@ -63,7 +63,7 @@ def summary else "#{Tty.blue}==>#{Tty.white} Success!#{Tty.reset} " end - s << "#{@cask} installed to '#{@cask.staged_path}' (#{@cask.staged_path.cabv})" + s << "#{@cask} staged at '#{@cask.staged_path}' (#{@cask.staged_path.cabv})" end def download diff --git a/test/cask/cli/install_test.rb b/test/cask/cli/install_test.rb index b85342884ee9..cb37e09313c9 100644 --- a/test/cask/cli/install_test.rb +++ b/test/cask/cli/install_test.rb @@ -29,7 +29,7 @@ TestHelper.must_output(self, lambda { Cask::CLI::Install.run('local-transmission', '--force') - }, %r{==> Success! local-transmission installed to '#{Cask.caskroom}/local-transmission/2.61' \(487 files, 11M\)}) + }, %r{==> Success! local-transmission staged at '#{Cask.caskroom}/local-transmission/2.61' \(487 files, 11M\)}) end it "properly handles Casks that are not present" do