aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Reiter2016-10-06 22:34:39 +0200
committerGitHub2016-10-06 22:34:39 +0200
commit6923d81a720751b376a4eac6b548f383ac8ed48e (patch)
tree0a5e7f0e69aeff509390f9479d6fde9e8ed261b3
parentfaebc6481585bf352572c36ccec5e68a6fb037eb (diff)
parent9c2420a9ef95f153743bbef1d266928d6338f51e (diff)
downloadbrew-6923d81a720751b376a4eac6b548f383ac8ed48e.tar.bz2
Merge pull request #1236 from reitermarkus/homebrew-cask
“Homebrew Cask” -> “Homebrew-Cask”
-rw-r--r--Library/Homebrew/blacklist.rb6
-rw-r--r--Library/Homebrew/cmd/update-report.rb4
-rw-r--r--Library/Homebrew/requirement.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/blacklist.rb b/Library/Homebrew/blacklist.rb
index 1c79da159..93c8f81a0 100644
--- a/Library/Homebrew/blacklist.rb
+++ b/Library/Homebrew/blacklist.rb
@@ -9,7 +9,7 @@ def blacklisted?(name)
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.undent
@@ -73,7 +73,7 @@ def blacklisted?(name)
and cabal-install instead:
brew install ghc cabal-install
- You can install with Homebrew Cask:
+ You can install with Homebrew-Cask:
brew cask install haskell-platform
EOS
when "mysqldump-secure" then <<-EOS.undent
@@ -82,7 +82,7 @@ def blacklisted?(name)
when "ngrok" then <<-EOS.undent
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/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index a76167feb..629ce1f3f 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -443,7 +443,7 @@ class Reporter
# For formulae migrated to cask: Auto-install cask or provide install instructions.
if new_tap_name == "caskroom/cask"
if new_tap.installed? && (HOMEBREW_REPOSITORY/"Caskroom").directory?
- ohai "#{name} has been moved to Homebrew Cask."
+ ohai "#{name} has been moved to Homebrew-Cask."
ohai "brew uninstall --force #{name}"
system HOMEBREW_BREW_FILE, "uninstall", "--force", name
ohai "brew prune"
@@ -451,7 +451,7 @@ class Reporter
ohai "brew cask install #{name}"
system HOMEBREW_BREW_FILE, "cask", "install", name
else
- ohai "#{name} has been moved to Homebrew Cask.", <<-EOS.undent
+ ohai "#{name} has been moved to Homebrew-Cask.", <<-EOS.undent
To uninstall the formula and install the cask run:
brew uninstall --force #{name}
brew cask install #{name}
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index 5bc4b9a2b..fe1a3c020 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -36,7 +36,7 @@ class Requirement
if cask
s += <<-EOS.undent
- You can install with Homebrew Cask:
+ You can install with Homebrew-Cask:
brew cask install #{cask}
EOS
end