Skip to content

Commit

Permalink
long update command now uses ';' instead of '&&'
Browse files Browse the repository at this point in the history
  • Loading branch information
vitorgalvao authored and jawshooah committed Dec 9, 2015
1 parent d2674ce commit 5e79596
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ When reporting bugs, remember that homebrew-cask is an independent project from
Before reporting a bug, make sure you have the latest versions of homebrew, homebrew-cask, and all Taps by running the following command:

```bash
$ brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup
$ brew update ; brew cleanup ; brew cask cleanup
```

If the issue persists, please run the problematic command with the `--verbose` flag and post its and `brew cask doctor`’s outputs in distinct [fenced code blocks](https://help.github.com/articles/github-flavored-markdown/#fenced-code-blocks).
Expand Down
2 changes: 1 addition & 1 deletion USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ It is generally safe to run updates from within an Application.
When a new version homebrew-cask is released, it will appear in the output of `brew outdated` after running `brew update`. You can upgrade it via the normal Homebrew `brew upgrade` workflow:

```bash
$ brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup
$ brew update ; brew cleanup ; brew cask cleanup
```

## Additional Taps (optional)
Expand Down
6 changes: 3 additions & 3 deletions doc/src/brew-cask.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ names, and other aspects of this manual are still subject to change.
* `search` or `-S` <text> | /<regexp>/:
Perform a substring search of known Cask tokens for <text>. If the text
is delimited by slashes, it is interpreted as a Ruby regular expression.

* `uninstall [--force]` or `rm` or `remove` <token> [ <token> ... ]:
Uninstall the given Cask. With `--force`, uninstall even if the Cask
does not appear to be present.
Expand All @@ -105,7 +105,7 @@ names, and other aspects of this manual are still subject to change.
`uninstall` without `--force` is also imperfect. It may be unable to
perform an `uninstall` operation if the given Cask has changed since you
installed it. This issue is being addressed.

* `update`:
For convenience. `brew cask update` is a synonym for `brew update`.

Expand Down Expand Up @@ -183,7 +183,7 @@ in a future version.
Homebrew-cask is implemented as a external command for Homebrew. That means
this project is entirely built upon the Homebrew infrastructure. For
example, upgrades to the Homebrew-cask tool are received through Homebrew:
`brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup`
`brew update ; brew cleanup ; brew cask cleanup`

And updates to individual Cask definitions are received whenever you issue
the Homebrew command:
Expand Down
2 changes: 1 addition & 1 deletion lib/hbc/artifact/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def self.read_script_arguments(arguments, stanza, default_arguments={}, override
permitted_keys = [:args, :input, :executable, :must_succeed, :sudo, :bsexec, :print_stdout, :print_stderr]
unknown_keys = arguments.keys - permitted_keys
unless unknown_keys.empty?
opoo %Q{Unknown arguments to #{description} -- #{unknown_keys.inspect} (ignored). Running "brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup" will likely fix it.}
opoo %Q{Unknown arguments to #{description} -- #{unknown_keys.inspect} (ignored). Running "brew update ; brew cleanup ; brew cask cleanup" will likely fix it.}
end
arguments.reject! {|k,v| ! permitted_keys.include?(k)}

Expand Down
2 changes: 1 addition & 1 deletion lib/hbc/artifact/uninstall_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def dispatch_uninstall_directives(stanza, expand_tilde=true)
directives_set.each do |directives|
unknown_keys = directives.keys - [:early_script, :launchctl, :quit, :signal, :kext, :script, :pkgutil, :delete, :trash, :rmdir]
unless unknown_keys.empty?
opoo %Q{Unknown arguments to #{stanza} -- #{unknown_keys.inspect}. Running "brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup" will likely fix it.}
opoo %Q{Unknown arguments to #{stanza} -- #{unknown_keys.inspect}. Running "brew update ; brew cleanup ; brew cask cleanup" will likely fix it.}
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/hbc/dsl/postflight.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def suppress_move_to_applications(options = {})
permitted_keys = [:key]
unknown_keys = options.keys - permitted_keys
unless unknown_keys.empty?
opoo %Q{Unknown arguments to suppress_move_to_applications -- #{unknown_keys.inspect} (ignored). Running "brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup" will likely fix it.}
opoo %Q{Unknown arguments to suppress_move_to_applications -- #{unknown_keys.inspect} (ignored). Running "brew update ; brew cleanup ; brew cask cleanup" will likely fix it.}
end
key = options[:key] || 'moveToApplicationsFolderAlertSuppress'
begin
Expand Down
2 changes: 1 addition & 1 deletion lib/hbc/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Hbc::Utils; end

require 'hbc/utils/tty'

UPDATE_CMD = "brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup"
UPDATE_CMD = "brew update ; brew cleanup ; brew cask cleanup"
ISSUES_URL = "https://github.com/caskroom/homebrew-cask/issues"

# todo: temporary
Expand Down
2 changes: 1 addition & 1 deletion man/man1/brew-cask.1
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Target location for “helper” executable links\. The default value is \fB/usr
Output debugging information of use to Cask authors and developers\.
.
.SH "INTERACTION WITH HOMEBREW"
Homebrew\-cask is implemented as a external command for Homebrew\. That means this project is entirely built upon the Homebrew infrastructure\. For example, upgrades to the Homebrew\-cask tool are received through Homebrew: \fBbrew update && brew upgrade brew\-cask && brew cleanup && brew cask cleanup\fR
Homebrew\-cask is implemented as a external command for Homebrew\. That means this project is entirely built upon the Homebrew infrastructure\. For example, upgrades to the Homebrew\-cask tool are received through Homebrew: \fBbrew update ; brew cleanup ; brew cask cleanup\fR
.
.P
And updates to individual Cask definitions are received whenever you issue the Homebrew command: brew update
Expand Down
2 changes: 1 addition & 1 deletion test/cask/dsl_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
.*
Unexpected method 'future_feature' called on Cask unexpected-method-cask\\.
.*
brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup
brew update ; brew cleanup ; brew cask cleanup
.*
https://github.com/caskroom/homebrew-cask/issues
EOREGEX
Expand Down

0 comments on commit 5e79596

Please sign in to comment.