dorkbox
/
OS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issues with split regex

master
Robinson 2023-01-03 22:14:12 +01:00
parent 278ec16646
commit d2f72ecd1d
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dorkbox/os/OS.kt
View File

@ -520,7 +520,7 @@ object OS {
try {
val output = getProperty("os.version")
if (output != null) {
val split = output.split("\\.").dropLastWhile { it.isEmpty() }.toTypedArray()
val split = output.split(".").dropLastWhile { it.isEmpty() }.toTypedArray()
if (split.size <= 2) {
for (i in split.indices) {
version[i] = split[i].toInt()
@ -746,7 +746,7 @@ object OS {
if (!isUbuntu) {
intArrayOf(0, 0)
} else if (distribReleaseInfo != null) {
val split = distribReleaseInfo!!.split("\\.").toTypedArray()
val split = distribReleaseInfo!!.split(".").toTypedArray()
intArrayOf(split[0].toInt(), split[1].toInt())
} else {
intArrayOf(0, 0)
@ -764,7 +764,7 @@ object OS {
if (!isElementaryOS) {
intArrayOf(0, 0)
} else if (distribReleaseInfo != null) {
val split = distribReleaseInfo!!.split("\\.").toTypedArray()
val split = distribReleaseInfo!!.split(".").toTypedArray()
intArrayOf(split[0].toInt(), split[1].toInt())
} else {
intArrayOf(0, 0)
@ -966,12 +966,9 @@ object OS {
}
val isGnome: Boolean by lazy {
System.err.println("1")
if (!isLinux && !isUnix) {
System.err.println("2")
false
} else {
System.err.println("3")
try {
// note: some versions of linux can ONLY access "ps a"; FreeBSD and most linux is "ps x"
// we try "x" first
@ -1072,7 +1069,7 @@ object OS {
0.0
} else {
// this isn't the BEST way to do this, but it's simple and easy to understand
val split = plasmaVersionFull!!.split("\\.", limit = 3).toTypedArray()
val split = plasmaVersionFull!!.split(".", limit = 3).toTypedArray()
if (split.size > 2) {
(split[0] + "." + split[1]).toDouble()
} else {