Merge pull request #6840 from rolandwalker/doc_stage_vs_install

use "staged" instead of "installed" for Caskroom files in messages
Homebrew · Oct 23, 2014 · bad6d69 · bad6d69
2 parents d93f72f + cd63241
commit bad6d69
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 <Casks> are given, list the installed files for <Casks>.
+    If <Casks> are given, list the staged files for <Casks>.
 
   * `uninstall [--force]` or `rm` or `remove` <Cask>:
     Uninstall <Cask>.  With `--force`, uninstall even if the Cask does

diff --git 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
@@ -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
@@ -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