diff options
| author | Jack Nagel | 2015-06-16 20:02:10 -0400 |
|---|---|---|
| committer | Jack Nagel | 2015-06-16 20:02:10 -0400 |
| commit | f4027cc9ac9f8dc284a163559e475396373729cb (patch) | |
| tree | 81d286357eb3d78f822c352f435da2fa0a6e0626 /Library | |
| parent | f1fd1d3d791b93ef381a62d0df7ae6493f7f24e2 (diff) | |
| download | brew-f4027cc9ac9f8dc284a163559e475396373729cb.tar.bz2 | |
"Mac OS X" -> "OS X" in copy
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_support.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/global.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb index 77089d42c..6813c1faa 100644 --- a/Library/Homebrew/formula_support.rb +++ b/Library/Homebrew/formula_support.rb @@ -25,19 +25,19 @@ class KegOnlyReason def to_s case @reason when :provided_by_osx then <<-EOS -Mac OS X already provides this software and installing another version in +OS X already provides this software and installing another version in parallel can cause all kinds of trouble. #{@explanation} EOS when :shadowed_by_osx then <<-EOS -Mac OS X provides similar software, and installing this software in +OS X provides similar software, and installing this software in parallel can cause all kinds of trouble. #{@explanation} EOS when :provided_pre_mountain_lion then <<-EOS -Mac OS X already provides this software in versions before Mountain Lion. +OS X already provides this software in versions before Mountain Lion. #{@explanation} EOS diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 7374bd5e8..2c71b473f 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -30,7 +30,7 @@ RUBY_BIN = RUBY_PATH.dirname if RUBY_PLATFORM =~ /darwin/ MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp MACOS_VERSION = MACOS_FULL_VERSION[/10\.\d+/] - OS_VERSION = "Mac OS X #{MACOS_FULL_VERSION}" + OS_VERSION = "OS X #{MACOS_FULL_VERSION}" else MACOS_FULL_VERSION = MACOS_VERSION = "0" OS_VERSION = RUBY_PLATFORM diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 1ae0a57d6..ac8609f23 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -20,7 +20,7 @@ module OS if MacOS.version > "10.10" "7.0" else - raise "Mac OS X '#{MacOS.version}' is invalid" + raise "OS X '#{MacOS.version}' is invalid" end end end |