From 60b698ba2808dd09211461f00d5b2b2a0a0ac7fc Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Sat, 16 Feb 2019 17:31:24 -0500 Subject: [PATCH 1/3] Clean up blacklisted package messages Ensure consistent formatting and provide references to all MacTeX packages --- Library/Homebrew/missing_formula.rb | 39 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb index 46e86d5215..6cef1881df 100644 --- a/Library/Homebrew/missing_formula.rb +++ b/Library/Homebrew/missing_formula.rb @@ -11,34 +11,40 @@ module Homebrew def blacklisted_reason(name) case name.downcase when "gem", /^rubygems?$/ then <<~EOS - Homebrew provides gem via: `brew install ruby`. + gem is part of the ruby formula: + brew install ruby 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) - - We recommend using a MacTeX distribution: https://www.tug.org/mactex/ - - You can install it with Homebrew Cask: + There are three versions of MacTeX. Full installation: brew cask install mactex + + Full installation without bundled applications: + brew cask install mactex-no-gui + + Minimal installation: + brew cask install basictex + + You may also want the TeX Live Utility with the latter options: + brew cask install tex-live-utility EOS when "pip" then <<~EOS - pip is part of the python formula, and can be installed with: + pip is part of the python formula: 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 - Instead of PIL, consider `pip2 install pillow`. + Instead of PIL, consider pillow: + pip2 install pillow EOS when "macruby" then <<~EOS MacRuby is not packaged and is on an indefinite development hiatus. You can read more about it at: #{Formatter.url("https://github.com/MacRuby/MacRuby")} + + You can instead install the ruby formula: + brew install ruby EOS when /(lib)?lzma/ then <<~EOS - lzma is now part of the xz formula, and can be installed with: + lzma is now part of the xz formula: brew install xz EOS when "gtest", "googletest", "google-test" then <<~EOS @@ -54,10 +60,11 @@ module Homebrew ruin SSH's security. EOS when "gsutil" then <<~EOS - Install gsutil with `pip2 install gsutil` + gsutil is available through pip: + pip2 install gsutil EOS when "gfortran" then <<~EOS - GNU Fortran is now part of the GCC formula, and can be installed with: + GNU Fortran is part of the GCC formula: brew install gcc EOS when "play" then <<~EOS @@ -83,7 +90,7 @@ module Homebrew brew cask install ngrok EOS when "cargo" then <<~EOS - cargo is part of the rust formula, and can be installed with: + cargo is part of the rust formula: brew install rust EOS end From 1efdd418872d718498aa44afaf276478578648c4 Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Mon, 18 Feb 2019 15:42:49 -0500 Subject: [PATCH 2/3] Further improvement to blacklist messages --- Library/Homebrew/missing_formula.rb | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb index 6cef1881df..37b0ffa68d 100644 --- a/Library/Homebrew/missing_formula.rb +++ b/Library/Homebrew/missing_formula.rb @@ -11,11 +11,13 @@ module Homebrew def blacklisted_reason(name) case name.downcase when "gem", /^rubygems?$/ then <<~EOS - gem is part of the ruby formula: + macOS provides gem as part of Ruby. To install a newer version: brew install ruby EOS when "tex", "tex-live", "texlive", "latex" then <<~EOS - There are three versions of MacTeX. Full installation: + There are three versions of MacTeX. + + Full installation: brew cask install mactex Full installation without bundled applications: @@ -23,9 +25,6 @@ module Homebrew Minimal installation: brew cask install basictex - - You may also want the TeX Live Utility with the latter options: - brew cask install tex-live-utility EOS when "pip" then <<~EOS pip is part of the python formula: @@ -36,11 +35,7 @@ module Homebrew pip2 install pillow EOS when "macruby" then <<~EOS - MacRuby is not packaged and is on an indefinite development hiatus. - You can read more about it at: - #{Formatter.url("https://github.com/MacRuby/MacRuby")} - - You can instead install the ruby formula: + macOS provides Ruby. To install a newer version: brew install ruby EOS when /(lib)?lzma/ then <<~EOS @@ -76,9 +71,16 @@ module Homebrew #{Formatter.url("https://www.playframework.com/documentation/2.3.x/Highlights23")} EOS when "haskell-platform" then <<~EOS - We no longer package haskell-platform. Consider installing ghc, - cabal-install and stack instead: - brew install ghc cabal-install stack + The components of the Haskell Platform are available separately. + + Glasgow Haskell Compiler: + brew install ghc + + Cabal build system: + brew install cabal-install + + Haskell Stack tool: + brew install haskell-stack EOS when "mysqldump-secure" then <<~EOS The creator of mysqldump-secure tried to game our popularity metrics. From 332f437f39634a6ecfdae9c47d5749568cc06e24 Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Mon, 18 Feb 2019 16:20:59 -0500 Subject: [PATCH 3/3] MacRuby > RubyMotion --- Library/Homebrew/missing_formula.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb index 37b0ffa68d..4424d3b78b 100644 --- a/Library/Homebrew/missing_formula.rb +++ b/Library/Homebrew/missing_formula.rb @@ -35,8 +35,8 @@ module Homebrew pip2 install pillow EOS when "macruby" then <<~EOS - macOS provides Ruby. To install a newer version: - brew install ruby + MacRuby has been discontinued. Consider RubyMotion: + brew cask install rubymotion EOS when /(lib)?lzma/ then <<~EOS lzma is now part of the xz formula: