Skip to content

Commit 325943d

Browse files
committed
[backport] SI-7497 Use osName startsWith "Mac OS X" ...
... instead of `osName contains "OS X"` See http://mail.openjdk.java.net/pipermail/macosx-port-dev/2012-November/005148.html for the reason why we don't follow developer.apple.com/library/mac/#technotes/tn2002/tn2110.
1 parent dd544d8 commit 325943d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/library/scala/util/Properties.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,10 @@ private[scala] trait PropertiesTrait {
128128
/* Some derived values. */
129129
/** Returns `true` iff the underlying operating system is a version of Microsoft Windows. */
130130
def isWin = osName startsWith "Windows"
131+
// See http://mail.openjdk.java.net/pipermail/macosx-port-dev/2012-November/005148.html for
132+
// the reason why we don't follow developer.apple.com/library/mac/#technotes/tn2002/tn2110.
131133
/** Returns `true` iff the underlying operating system is a version of Apple Mac OSX. */
132-
def isMac = osName contains "OS X" // See developer.apple.com/library/mac/#technotes/tn2002/tn2110
134+
def isMac = osName startsWith "Mac OS X"
133135

134136
def versionMsg = "Scala %s %s -- %s".format(propCategory, versionString, copyrightString)
135137
def scalaCmd = if (isWin) "scala.bat" else "scala"

0 commit comments

Comments
 (0)