diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-05-23 21:16:00 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-05-23 21:16:00 +0200 |
| commit | 325943d5c34e4dfc901d589dec6e97f9fcfd1372 (patch) | |
| tree | c783ebb2e54307a16738e7154316c9703e6762ff | |
| parent | dd544d88fe62d1fc4d33be271ea0d3317916a0ec (diff) | |
| download | scala-325943d5c34e4dfc901d589dec6e97f9fcfd1372.tar.gz scala-325943d5c34e4dfc901d589dec6e97f9fcfd1372.tar.bz2 scala-325943d5c34e4dfc901d589dec6e97f9fcfd1372.zip | |
[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.
| -rw-r--r-- | src/library/scala/util/Properties.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 03e23887a5..457f795b25 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -128,8 +128,10 @@ private[scala] trait PropertiesTrait { /* Some derived values. */ /** Returns `true` iff the underlying operating system is a version of Microsoft Windows. */ def isWin = osName startsWith "Windows" + // 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. /** Returns `true` iff the underlying operating system is a version of Apple Mac OSX. */ - def isMac = osName contains "OS X" // See developer.apple.com/library/mac/#technotes/tn2002/tn2110 + def isMac = osName startsWith "Mac OS X" def versionMsg = "Scala %s %s -- %s".format(propCategory, versionString, copyrightString) def scalaCmd = if (isWin) "scala.bat" else "scala" |