From 3dc0df5a774272766e2187b46df97742b3aec28a Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 5 Feb 2019 13:38:08 +0000 Subject: [PATCH 1/2] missing_formula.rb: add help message for cargo ...modeled after the existing message for pip. Also sync format of the gfortran and lzma messages, and use typographic apostrophe in the *tex message. --- Library/Homebrew/missing_formula.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb index 4cf229b125..758db9dc8b 100644 --- a/Library/Homebrew/missing_formula.rb +++ b/Library/Homebrew/missing_formula.rb @@ -15,7 +15,7 @@ module Homebrew EOS when "tex", "tex-live", "texlive", "latex" then <<~EOS Installing TeX from source is weird and gross, requires a lot of patches, - and only builds 32-bit (and thus can't use Homebrew dependencies) + and only builds 32-bit (and thus can’t use Homebrew dependencies) We recommend using a MacTeX distribution: https://www.tug.org/mactex/ @@ -36,8 +36,10 @@ module Homebrew You can read more about it at: #{Formatter.url("https://github.com/MacRuby/MacRuby")} EOS - when /(lib)?lzma/ - "lzma is now part of the xz formula." + when /(lib)?lzma/ then <<~EOS + lzma is now part of the xz formula, and can be installed with: + brew install xz. + EOS when "gtest", "googletest", "google-test" then <<~EOS Installing gtest system-wide is not recommended; it should be vendored in your projects that use it. @@ -54,7 +56,7 @@ module Homebrew Install gsutil with `pip2 install gsutil` EOS when "gfortran" then <<~EOS - GNU Fortran is now provided as part of GCC, and can be installed with: + GNU Fortran is now part of the GCC formula, and can be installed with: brew install gcc EOS when "play" then <<~EOS @@ -79,6 +81,9 @@ module Homebrew If you wish to use the 2.x release you can install with Homebrew Cask: brew cask install ngrok EOS + when "cargo" then <<~EOS + Homebrew provides cargo via: `brew install rust`. + EOS end end alias generic_blacklisted_reason blacklisted_reason From 2dccfe1d022a3501dfec15a3d0e4ae3a5588827c Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 5 Feb 2019 14:05:57 +0000 Subject: [PATCH 2/2] Update missing_formula.rb --- Library/Homebrew/missing_formula.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb index 758db9dc8b..46e86d5215 100644 --- a/Library/Homebrew/missing_formula.rb +++ b/Library/Homebrew/missing_formula.rb @@ -15,7 +15,7 @@ module Homebrew EOS when "tex", "tex-live", "texlive", "latex" then <<~EOS Installing TeX from source is weird and gross, requires a lot of patches, - and only builds 32-bit (and thus can’t use Homebrew dependencies) + and only builds 32-bit (and thus can't use Homebrew dependencies) We recommend using a MacTeX distribution: https://www.tug.org/mactex/ @@ -23,9 +23,10 @@ module Homebrew brew cask install mactex EOS when "pip" then <<~EOS - Homebrew provides pip via: `brew install python`. However you will then - have two Pythons installed on your Mac, so alternatively you can install - pip via the instructions at: + pip is part of the python formula, and can be installed with: + brew install python + However you will then have two Pythons installed on your Mac, + so alternatively you can install pip via the instructions at: #{Formatter.url("https://pip.readthedocs.io/en/stable/installing/")} EOS when "pil" then <<~EOS @@ -38,7 +39,7 @@ module Homebrew EOS when /(lib)?lzma/ then <<~EOS lzma is now part of the xz formula, and can be installed with: - brew install xz. + brew install xz EOS when "gtest", "googletest", "google-test" then <<~EOS Installing gtest system-wide is not recommended; it should be vendored @@ -82,7 +83,8 @@ module Homebrew brew cask install ngrok EOS when "cargo" then <<~EOS - Homebrew provides cargo via: `brew install rust`. + cargo is part of the rust formula, and can be installed with: + brew install rust EOS end end