diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb
index ec7def395..272624ab3 100644
--- a/Library/Homebrew/cask/audit.rb
+++ b/Library/Homebrew/cask/audit.rb
@@ -65,7 +65,7 @@ module Hbc
return if tap.user != "Homebrew"
return unless cask.artifacts.any? { |k| k.is_a?(Hbc::Artifact::Pkg) && k.stanza_options.key?(:allow_untrusted) }
- add_warning "allow_untrusted is not permitted in official Homebrew-Cask taps"
+ add_warning "allow_untrusted is not permitted in official Homebrew Cask taps"
end
def check_stanza_requires_uninstall
@@ -204,7 +204,7 @@ module Hbc
return unless cask.appcast
return unless cask.appcast.checkpoint
- add_error "Appcast checkpoints have been removed from Homebrew-Cask"
+ add_error "Appcast checkpoints have been removed from Homebrew Cask"
end
def check_latest_with_appcast
diff --git a/Library/Homebrew/cask/cli.rb b/Library/Homebrew/cask/cli.rb
index ee2176761..4fafbcec9 100644
--- a/Library/Homebrew/cask/cli.rb
+++ b/Library/Homebrew/cask/cli.rb
@@ -225,8 +225,8 @@ module Hbc
def purpose
puts <<~EOS
- brew-cask provides a friendly homebrew-style CLI workflow for the
- administration of macOS applications distributed as binaries.
+ Homebrew Cask provides a friendly CLI workflow for the administration
+ of macOS applications distributed as binaries.
EOS
end
diff --git a/Library/Homebrew/cask/cli/--version.rb b/Library/Homebrew/cask/cli/--version.rb
index 1833c51c6..e903ae429 100644
--- a/Library/Homebrew/cask/cli/--version.rb
+++ b/Library/Homebrew/cask/cli/--version.rb
@@ -16,7 +16,7 @@ module Hbc
end
def self.help
- "displays the Homebrew-Cask version"
+ "displays the Homebrew Cask version"
end
end
end
diff --git a/Library/Homebrew/cask/cli/doctor.rb b/Library/Homebrew/cask/cli/doctor.rb
index c19b53b33..e35a32566 100644
--- a/Library/Homebrew/cask/cli/doctor.rb
+++ b/Library/Homebrew/cask/cli/doctor.rb
@@ -33,7 +33,7 @@ module Hbc
end
def check_software_versions
- ohai "Homebrew-Cask Version", Hbc.full_version
+ ohai "Homebrew Cask Version", Hbc.full_version
ohai "macOS", MacOS.full_version
ohai "SIP", self.class.check_sip
ohai "Java", SystemConfig.describe_java
@@ -43,7 +43,7 @@ module Hbc
# where "doctor" is needed is precisely the situation where such
# things are less dependable.
def check_install_location
- ohai "Homebrew-Cask Install Location"
+ ohai "Homebrew Cask Install Location"
locations = Dir.glob(HOMEBREW_CELLAR.join("brew-cask", "*")).reverse
if locations.empty?
@@ -57,7 +57,7 @@ module Hbc
end
def check_staging_location
- ohai "Homebrew-Cask Staging Location"
+ ohai "Homebrew Cask Staging Location"
path = Caskroom.path
@@ -72,7 +72,7 @@ module Hbc
default_tap = Tap.default_cask_tap
alt_taps = Tap.select { |t| t.cask_dir.exist? && t != default_tap }
- ohai "Homebrew-Cask Taps:"
+ ohai "Homebrew Cask Taps:"
[default_tap, *alt_taps].each do |tap|
if tap.path.nil? || tap.path.to_s.empty?
puts none_string
diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb
index 54a28495a..b3789a662 100644
--- a/Library/Homebrew/cask/dsl/caveats.rb
+++ b/Library/Homebrew/cask/dsl/caveats.rb
@@ -79,7 +79,7 @@ module Hbc
<<~EOS
Cask #{@cask} installs files under /usr/local. The presence of such
files can cause warnings when running "brew doctor", which is considered
- to be a bug in Homebrew-Cask.
+ to be a bug in Homebrew Cask.
EOS
end
diff --git a/Library/Homebrew/cask/exceptions.rb b/Library/Homebrew/cask/exceptions.rb
index 7fc171586..7e092e57e 100644
--- a/Library/Homebrew/cask/exceptions.rb
+++ b/Library/Homebrew/cask/exceptions.rb
@@ -62,7 +62,7 @@ module Hbc
class CaskX11DependencyError < AbstractCaskErrorWithToken
def to_s
<<~EOS
- Cask '#{token}' requires XQuartz/X11, which can be installed using Homebrew-Cask by running
+ Cask '#{token}' requires XQuartz/X11, which can be installed using Homebrew Cask by running
#{Formatter.identifier("brew cask install xquartz")}
or manually, by downloading the package from
diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb
index 52b9c340b..a029984c5 100644
--- a/Library/Homebrew/cask/installer.rb
+++ b/Library/Homebrew/cask/installer.rb
@@ -520,7 +520,7 @@ module Hbc
# versioned staged distribution
gain_permissions_remove(backup_path) if backup_path&.exist?
- # Homebrew-Cask metadata
+ # Homebrew Cask metadata
return unless backup_metadata_path.directory?
backup_metadata_path.children.each do |subdir|
@@ -535,7 +535,7 @@ module Hbc
# versioned staged distribution
gain_permissions_remove(@cask.staged_path) if @cask.staged_path&.exist?
- # Homebrew-Cask metadata
+ # Homebrew Cask metadata
if @cask.metadata_versioned_path.directory?
@cask.metadata_versioned_path.children.each do |subdir|
gain_permissions_remove(subdir)
diff --git a/Library/Homebrew/cask/utils/quarantine.swift b/Library/Homebrew/cask/utils/quarantine.swift
index af89e2ce1..e20889434 100644
--- a/Library/Homebrew/cask/utils/quarantine.swift
+++ b/Library/Homebrew/cask/utils/quarantine.swift
@@ -16,7 +16,7 @@ let dataLocationUrl: NSURL = NSURL.init(fileURLWithPath: CommandLine.arguments[1
var errorBag: NSError?
let quarantineProperties: [String: Any] = [
- kLSQuarantineAgentNameKey as String: "Homebrew-Cask",
+ kLSQuarantineAgentNameKey as String: "Homebrew Cask",
kLSQuarantineTypeKey as String: kLSQuarantineTypeWebDownload,
kLSQuarantineDataURLKey as String: CommandLine.arguments[2],
kLSQuarantineOriginURLKey as String: CommandLine.arguments[3]
diff --git a/Library/Homebrew/cask/version.rb b/Library/Homebrew/cask/version.rb
index 370d37be4..c76637842 100644
--- a/Library/Homebrew/cask/version.rb
+++ b/Library/Homebrew/cask/version.rb
@@ -2,7 +2,7 @@ module Hbc
def self.full_version
@full_version ||= begin
<<~EOS
- Homebrew-Cask #{HOMEBREW_VERSION}
+ Homebrew Cask #{HOMEBREW_VERSION}
#{Tap.default_cask_tap.full_name} #{Tap.default_cask_tap.version_string}
EOS
end
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 009180407..38d59a0f5 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -328,7 +328,7 @@ class Reporter
# For formulae migrated to cask: Auto-install cask or provide install instructions.
if new_tap_name.start_with?("homebrew/cask")
if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory?
- ohai "#{name} has been moved to Homebrew-Cask."
+ ohai "#{name} has been moved to Homebrew Cask."
ohai "brew unlink #{name}"
system HOMEBREW_BREW_FILE, "unlink", name
ohai "brew prune"
@@ -336,13 +336,13 @@ class Reporter
ohai "brew cask install #{new_name}"
system HOMEBREW_BREW_FILE, "cask", "install", new_name
ohai <<~EOS
- #{name} has been moved to Homebrew-Cask.
+ #{name} has been moved to Homebrew Cask.
The existing keg has been unlinked.
Please uninstall the formula when convenient by running:
brew uninstall --force #{name}
EOS
else
- ohai "#{name} has been moved to Homebrew-Cask.", <<~EOS
+ ohai "#{name} has been moved to Homebrew Cask.", <<~EOS
To uninstall the formula and install the cask run:
brew uninstall --force #{name}
brew tap #{new_tap_name}
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 7c9c7409e..187fc0358 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -232,7 +232,7 @@ module Homebrew
<<~EOS
Your XQuartz (#{MacOS::XQuartz.version}) is outdated.
Please install XQuartz #{MacOS::XQuartz.latest_version} (or delete the current version).
- XQuartz can be updated using Homebrew-Cask by running
+ XQuartz can be updated using Homebrew Cask by running
brew cask reinstall xquartz
EOS
end
diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md
index 914f686a7..a49da1a19 100644
--- a/Library/Homebrew/manpages/brew-cask.1.md
+++ b/Library/Homebrew/manpages/brew-cask.1.md
@@ -7,13 +7,13 @@ brew-cask(1) - a friendly binary installer for macOS
## DESCRIPTION
-Homebrew-Cask is a tool for installing precompiled macOS binaries (such as
+Homebrew Cask is a tool for installing precompiled macOS binaries (such as
Applications) from the command line. The user is never required to use the
graphical user interface.
## ALPHA-QUALITY SOFTWARE
-Homebrew-Cask works robustly enough that we welcome new users, but the
+Homebrew Cask works robustly enough that we welcome new users, but the
project is still in early development. That means command names, option
names, and other aspects of this manual are still subject to change.
@@ -221,9 +221,9 @@ in a future version.
## INTERACTION WITH HOMEBREW
-Homebrew-Cask is implemented as a external command for Homebrew. That means
+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:
+example, upgrades to the Homebrew Cask tool are received through Homebrew:
brew update; brew cask upgrade; brew cleanup
@@ -234,12 +234,12 @@ the Homebrew command:
## OTHER WAYS TO SPECIFY A CASK
-Most Homebrew-Cask commands can accept a Cask token as an argument. As
+Most Homebrew Cask commands can accept a Cask token as an argument. As
described above, the argument can take the form of:
* A simple token, e.g. `google-chrome`
-Homebrew-Cask also accepts three other forms in place of plain tokens:
+Homebrew Cask also accepts three other forms in place of plain tokens:
* A fully-qualified token which includes the Tap name, e.g.
`homebrew/cask-fonts/font-symbola`
@@ -252,11 +252,11 @@ Homebrew-Cask also accepts three other forms in place of plain tokens:
## ENVIRONMENT
-Homebrew-Cask respects many of the environment variables used by the
+Homebrew Cask respects many of the environment variables used by the
parent command `brew`. Please refer to the `brew`(1) man page for more
information.
-Environment variables specific to Homebrew-Cask:
+Environment variables specific to Homebrew Cask:
* `HOMEBREW_CASK_OPTS`:
This variable may contain any arguments normally used as options on
@@ -268,14 +268,14 @@ Environment variables specific to Homebrew-Cask:
Other environment variables:
* `SUDO_ASKPASS`:
- When this variable is set, Homebrew-Cask will call `sudo`(8) with the `-A` option.
+ When this variable is set, Homebrew Cask will call `sudo`(8) with the `-A` option.
## SEE ALSO
-The Homebrew-Cask home page:
+The Homebrew Cask home page:
-The Homebrew-Cask GitHub page:
+The Homebrew Cask GitHub page:
`brew`(1), `curl`(1)
@@ -290,6 +290,6 @@ Man page format based on `brew.1.md` from Homebrew.
We still have bugs - and we are busy fixing them! If you have a problem, don't
be shy about reporting it on our [GitHub issues page](https://github.com/Homebrew/homebrew-cask/issues?state=open).
-When reporting bugs, remember that Homebrew-Cask is an independent project from
+When reporting bugs, remember that Homebrew Cask is an independent project from
Homebrew. Do your best to direct bug reports to the appropriate project. If
your command-line started with `brew cask`, bring the bug to us first!
diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb
index 3966088c1..616efd4a8 100644
--- a/Library/Homebrew/missing_formula.rb
+++ b/Library/Homebrew/missing_formula.rb
@@ -19,7 +19,7 @@ module Homebrew
We recommend using a MacTeX distribution: https://www.tug.org/mactex/
- You can install it with Homebrew-Cask:
+ You can install it with Homebrew Cask:
brew cask install mactex
EOS
when "pip" then <<~EOS
@@ -76,7 +76,7 @@ module Homebrew
when "ngrok" then <<~EOS
Upstream sunsetted 1.x in March 2016 and 2.x is not open-source.
- If you wish to use the 2.x release you can install with Homebrew-Cask:
+ If you wish to use the 2.x release you can install with Homebrew Cask:
brew cask install ngrok
EOS
end
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index fed639bc1..608e8d3a3 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -34,7 +34,7 @@ class Requirement
s = "#{class_name} unsatisfied!\n"
if cask
s += <<~EOS
- You can install with Homebrew-Cask:
+ You can install with Homebrew Cask:
brew cask install #{cask}
EOS
end
diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb
index 170af5b10..b5bb990e7 100644
--- a/Library/Homebrew/test/cask/audit_spec.rb
+++ b/Library/Homebrew/test/cask/audit_spec.rb
@@ -94,7 +94,7 @@ describe Hbc::Audit, :cask do
end
describe "pkg allow_untrusted checks" do
- let(:warning_msg) { "allow_untrusted is not permitted in official Homebrew-Cask taps" }
+ let(:warning_msg) { "allow_untrusted is not permitted in official Homebrew Cask taps" }
context "when the Cask has no pkg stanza" do
let(:cask_token) { "basic-cask" }
@@ -318,7 +318,7 @@ describe Hbc::Audit, :cask do
end
describe "appcast checkpoint check" do
- let(:error_msg) { "Appcast checkpoints have been removed from Homebrew-Cask" }
+ let(:error_msg) { "Appcast checkpoints have been removed from Homebrew Cask" }
context "when the Cask does not have a checkpoint" do
let(:cask_token) { "with-appcast" }
diff --git a/Library/Homebrew/test/cask/cli/--version_spec.rb b/Library/Homebrew/test/cask/cli/--version_spec.rb
index e7fcab65c..dc1a95805 100644
--- a/Library/Homebrew/test/cask/cli/--version_spec.rb
+++ b/Library/Homebrew/test/cask/cli/--version_spec.rb
@@ -1,8 +1,8 @@
describe Hbc::CLI::Version, :cask do
describe "::run" do
- it "outputs the current Homebrew-Cask version" do
+ it "outputs the current Homebrew Cask version" do
expect { described_class.run }
- .to output(/\AHomebrew-Cask.*\d+\.\d+\.\d+/).to_stdout
+ .to output(/\AHomebrew Cask.*\d+\.\d+\.\d+/).to_stdout
.and not_to_output.to_stderr
end
diff --git a/Library/Homebrew/test/cask/cli/doctor_spec.rb b/Library/Homebrew/test/cask/cli/doctor_spec.rb
index e3967060e..d6a3a2715 100644
--- a/Library/Homebrew/test/cask/cli/doctor_spec.rb
+++ b/Library/Homebrew/test/cask/cli/doctor_spec.rb
@@ -6,7 +6,7 @@ describe Hbc::CLI::Doctor, :cask do
it "displays some nice info about the environment" do
expect {
Hbc::CLI::Doctor.run
- }.to output(/\A==> Homebrew-Cask Version/).to_stdout
+ }.to output(/\A==> Homebrew Cask Version/).to_stdout
end
it "raises an exception when arguments are given" do
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
index 71816b5bc..6aa9f5a04 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
@@ -11,7 +11,7 @@ HOMEBREW_CASK_DIRS = {
:servicedir => Pathname.new(TEST_TMPDIR).join("cask-servicedir"),
}.freeze
-RSpec.shared_context "Homebrew-Cask", :needs_macos do
+RSpec.shared_context "Homebrew Cask", :needs_macos do
before do
HOMEBREW_CASK_DIRS.each do |method, path|
allow(Hbc::Config.global).to receive(method).and_return(path)
@@ -47,5 +47,5 @@ RSpec.shared_context "Homebrew-Cask", :needs_macos do
end
RSpec.configure do |config|
- config.include_context "Homebrew-Cask", :cask
+ config.include_context "Homebrew Cask", :cask
end
diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1
index ed0dca508..d861af411 100644
--- a/manpages/brew-cask.1
+++ b/manpages/brew-cask.1
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BREW\-CASK" "1" "August 2018" "Homebrew" "brew-cask"
+.TH "BREW\-CASK" "1" "September 2018" "Homebrew" "brew-cask"
.
.SH "NAME"
\fBbrew\-cask\fR \- a friendly binary installer for macOS
@@ -10,10 +10,10 @@
\fBbrew cask\fR command [options] [ \fItoken\fR \.\.\. ]
.
.SH "DESCRIPTION"
-Homebrew\-Cask is a tool for installing precompiled macOS binaries (such as Applications) from the command line\. The user is never required to use the graphical user interface\.
+Homebrew Cask is a tool for installing precompiled macOS binaries (such as Applications) from the command line\. The user is never required to use the graphical user interface\.
.
.SH "ALPHA\-QUALITY SOFTWARE"
-Homebrew\-Cask works robustly enough that we welcome new users, but the project is still in early development\. That means command names, option names, and other aspects of this manual are still subject to change\.
+Homebrew Cask works robustly enough that we welcome new users, but the project is still in early development\. That means command names, option names, and other aspects of this manual are still subject to change\.
.
.SH "FREQUENTLY USED COMMANDS"
.
@@ -230,7 +230,7 @@ Do not link "helper" executables to \fB/usr/local/bin\fR\.
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:
+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:
.
.IP "" 4
.
@@ -256,7 +256,7 @@ brew update
.IP "" 0
.
.SH "OTHER WAYS TO SPECIFY A CASK"
-Most Homebrew\-Cask commands can accept a Cask token as an argument\. As described above, the argument can take the form of:
+Most Homebrew Cask commands can accept a Cask token as an argument\. As described above, the argument can take the form of:
.
.IP "\(bu" 4
A simple token, e\.g\. \fBgoogle\-chrome\fR
@@ -264,7 +264,7 @@ A simple token, e\.g\. \fBgoogle\-chrome\fR
.IP "" 0
.
.P
-Homebrew\-Cask also accepts three other forms in place of plain tokens:
+Homebrew Cask also accepts three other forms in place of plain tokens:
.
.IP "\(bu" 4
A fully\-qualified token which includes the Tap name, e\.g\. \fBhomebrew/cask\-fonts/font\-symbola\fR
@@ -278,10 +278,10 @@ A \fBcurl\fR\-retrievable URI to a Cask file, e\.g\. \fBhttps://raw\.githubuserc
.IP "" 0
.
.SH "ENVIRONMENT"
-Homebrew\-Cask respects many of the environment variables used by the parent command \fBbrew\fR\. Please refer to the \fBbrew\fR(1) man page for more information\.
+Homebrew Cask respects many of the environment variables used by the parent command \fBbrew\fR\. Please refer to the \fBbrew\fR(1) man page for more information\.
.
.P
-Environment variables specific to Homebrew\-Cask:
+Environment variables specific to Homebrew Cask:
.
.TP
\fBHOMEBREW_CASK_OPTS\fR
@@ -303,13 +303,13 @@ Other environment variables:
.
.TP
\fBSUDO_ASKPASS\fR
-When this variable is set, Homebrew\-Cask will call \fBsudo\fR(8) with the \fB\-A\fR option\.
+When this variable is set, Homebrew Cask will call \fBsudo\fR(8) with the \fB\-A\fR option\.
.
.SH "SEE ALSO"
-The Homebrew\-Cask home page: \fIhttps://caskroom\.github\.io/\fR
+The Homebrew Cask home page: \fIhttps://caskroom\.github\.io/\fR
.
.P
-The Homebrew\-Cask GitHub page: \fIhttps://github\.com/Homebrew/homebrew\-cask\fR
+The Homebrew Cask GitHub page: \fIhttps://github\.com/Homebrew/homebrew\-cask\fR
.
.P
\fBbrew\fR(1), \fBcurl\fR(1)
@@ -324,4 +324,4 @@ Man page format based on \fBbrew\.1\.md\fR from Homebrew\.
We still have bugs \- and we are busy fixing them! If you have a problem, don\'t be shy about reporting it on our GitHub issues page \fIhttps://github\.com/Homebrew/homebrew\-cask/issues?state=open\fR\.
.
.P
-When reporting bugs, remember that Homebrew\-Cask is an independent project from Homebrew\. Do your best to direct bug reports to the appropriate project\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first!
+When reporting bugs, remember that Homebrew Cask is an independent project from Homebrew\. Do your best to direct bug reports to the appropriate project\. If your command\-line started with \fBbrew cask\fR, bring the bug to us first!
diff --git a/manpages/brew.1 b/manpages/brew.1
index df2451c07..3bf6e5095 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BREW" "1" "August 2018" "Homebrew" "brew"
+.TH "BREW" "1" "September 2018" "Homebrew" "brew"
.
.SH "NAME"
\fBbrew\fR \- The missing package manager for macOS