Skip to content
Snippets Groups Projects
Commit f4027cc9 authored by Jack Nagel's avatar Jack Nagel
Browse files

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

parent f1fd1d3d
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment