diff options
| author | Mike McQuaid | 2016-09-18 19:57:19 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-09-18 19:57:19 +0100 |
| commit | 3f9cce0a03e967d2e7bcb7cd16bbc898c1a35708 (patch) | |
| tree | 609a33441201227f7a6a81bcb61d8a3d17e2c8a3 /Library/Homebrew/formula_support.rb | |
| parent | f4a8d28819f1fee73fcc63d08e70cb36eecdfb20 (diff) | |
| download | brew-3f9cce0a03e967d2e7bcb7cd16bbc898c1a35708.tar.bz2 | |
Use new "macOS" naming where appropriate.
Not quite a mass replacement as I've used OS X and Mac OS X where
describing specific older versions and added compatibility methods
for things in the DSL.
Diffstat (limited to 'Library/Homebrew/formula_support.rb')
| -rw-r--r-- | Library/Homebrew/formula_support.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb index 83855d131..e4f800364 100644 --- a/Library/Homebrew/formula_support.rb +++ b/Library/Homebrew/formula_support.rb @@ -1,7 +1,7 @@ # Used to track formulae that cannot be installed at the same time FormulaConflict = Struct.new(:name, :reason) -# Used to annotate formulae that duplicate OS X provided software +# Used to annotate formulae that duplicate macOS provided software # or cause conflicts when linked in. class KegOnlyReason def initialize(reason, explanation) @@ -29,22 +29,22 @@ class KegOnlyReason def to_s return @explanation unless @explanation.empty? case @reason - when :provided_by_osx then <<-EOS -OS X already provides this software and installing another version in + when :provided_by_macos, :provided_by_osx then <<-EOS +macOS already provides this software and installing another version in parallel can cause all kinds of trouble. EOS - when :shadowed_by_osx then <<-EOS -OS X provides similar software and installing this software in + when :shadowed_by_macos, :shadowed_by_osx then <<-EOS +macOS provides similar software and installing this software in parallel can cause all kinds of trouble. EOS when :provided_pre_mountain_lion then <<-EOS -OS X already provides this software in versions before Mountain Lion. +macOS already provides this software in versions before Mountain Lion. EOS when :provided_pre_mavericks then <<-EOS -OS X already provides this software in versions before Mavericks. +macOS already provides this software in versions before Mavericks. EOS when :provided_pre_el_capitan then <<-EOS -OS X already provides this software in versions before El Capitan. +macOS already provides this software in versions before El Capitan. EOS when :provided_until_xcode43 "Xcode provides this software prior to version 4.3." |