summaryrefslogtreecommitdiff
path: root/src/library/scala/util/Properties.scala
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-03-01 15:09:49 +0100
committerSeth Tisue <seth@tisue.net>2016-03-01 15:09:49 +0100
commit662063dae1955e153c9a36b79ac8e51d241612f4 (patch)
tree46f0a19f280b639260bbedeee86883e7c3c0a429 /src/library/scala/util/Properties.scala
parentd0c8cc41080f32e2d3adaf501d0171cd25aa7e3d (diff)
parent71f2bc737d96fcd29fcf2e5f494c6ae259d7b64e (diff)
downloadscala-662063dae1955e153c9a36b79ac8e51d241612f4.tar.gz
scala-662063dae1955e153c9a36b79ac8e51d241612f4.tar.bz2
scala-662063dae1955e153c9a36b79ac8e51d241612f4.zip
Merge pull request #4934 from Shadow53/2.12.x
Added Properties.isLinux to compliment the isWin and isMac methods
Diffstat (limited to 'src/library/scala/util/Properties.scala')
-rw-r--r--src/library/scala/util/Properties.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
index 7ea597eac9..583f1539d1 100644
--- a/src/library/scala/util/Properties.scala
+++ b/src/library/scala/util/Properties.scala
@@ -148,6 +148,8 @@ private[scala] trait PropertiesTrait {
// 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 startsWith "Mac OS X"
+ /** Returns `true` iff the underlying operating system is a Linux distribution. */
+ def isLinux = osName startsWith "Linux"
/* Some runtime values. */
private[scala] def isAvian = javaVmName contains "Avian"