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

Fixed issues with different encodings on windows wrt getting version information.

master
Robinson 2023-11-19 22:28:09 +01:00
parent 0c1f718f49
commit e0b4eded81
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,8 +516,17 @@ object OS {
try {
val output = execute("cmd.exe", "/c", "ver")
if (output.isNotEmpty()) {
val index = output.indexOf("Version")
val versionInfoOnly = output.substring(index + 8, output.indexOf("]"))
// OF NOTE: It is possible to have a different encoding of windows, where the word "Version" doesn't exist.
// in this case, we'll just take the next set of numbers available
// Microsoft Windows [Version 10.0.22000.2600]
// Microsoft Windows [??? 10.0.22621.2283] (different encoding)
// slice out the [] because we don't want to include windows product names! (like Windows 2012) in the name!
// I don't specifically have this version to test, however it is easy enough to guard against.
val shortenedOutput = output.substring(output.indexOf("[") + 1, output.indexOf("]"))
val index = shortenedOutput.indexOfFirst { it.isDigit() }
val versionInfoOnly = shortenedOutput.substring(index, shortenedOutput.length)
val split = versionInfoOnly.split(".").toTypedArray()
if (split.size == 4) {
version[0] = split[0].toInt()