admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

"Mac OS X" -> "OS X" in copy

Browse Source
This commit is contained in:
Jack Nagel 2015-06-16 20:02:10 -04:00
parent f1fd1d3d79
commit f4027cc9ac
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_support.rb
View File

@ -25,19 +25,19 @@ class KegOnlyReason
def to_s def to_s
case @reason case @reason
when :provided_by_osx then <<-EOS 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. parallel can cause all kinds of trouble.
#{@explanation} #{@explanation}
EOS EOS
when :shadowed_by_osx then <<-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. parallel can cause all kinds of trouble.
#{@explanation} #{@explanation}
EOS EOS
when :provided_pre_mountain_lion then <<-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} #{@explanation}
EOS EOS

2
Library/Homebrew/global.rb
View File

@ -30,7 +30,7 @@ RUBY_BIN = RUBY_PATH.dirname
if RUBY_PLATFORM =~ /darwin/ if RUBY_PLATFORM =~ /darwin/
MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp
MACOS_VERSION = MACOS_FULL_VERSION[/10\.\d+/] MACOS_VERSION = MACOS_FULL_VERSION[/10\.\d+/]
OS_VERSION = "Mac OS X #{MACOS_FULL_VERSION}" OS_VERSION = "OS X #{MACOS_FULL_VERSION}"
else else
MACOS_FULL_VERSION = MACOS_VERSION = "0" MACOS_FULL_VERSION = MACOS_VERSION = "0"
OS_VERSION = RUBY_PLATFORM OS_VERSION = RUBY_PLATFORM

2
Library/Homebrew/os/mac/xcode.rb
View File

@ -20,7 +20,7 @@ module OS
if MacOS.version > "10.10" if MacOS.version > "10.10"
"7.0" "7.0"
else else
raise "Mac OS X '#{MacOS.version}' is invalid" raise "OS X '#{MacOS.version}' is invalid"
end end
end end
end end