Skip to content

Commit

Permalink
Merge pull request #6840 from rolandwalker/doc_stage_vs_install
Browse files Browse the repository at this point in the history
use "staged" instead of "installed" for Caskroom files in messages
  • Loading branch information
rolandwalker committed Oct 23, 2014
2 parents d93f72f + cd63241 commit bad6d69
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion doc/src/brew-cask.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/cask/cli/list.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/cask/installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/cask/cli/install_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bad6d69

Please sign in to comment.