3 files changed, 61 insertions, 2 deletions
diff --git a/libraries/systeminfo/src/sys_apple.cpp b/libraries/systeminfo/src/sys_apple.cpp
index 4bcffae4..6353b747 100644
--- a/libraries/systeminfo/src/sys_apple.cpp
+++ b/libraries/systeminfo/src/sys_apple.cpp
@@ -2,13 +2,40 @@
 
 #include <sys/utsname.h>
 
+#include <QString>
+#include <QStringList>
+#include <QDebug>
+
 Sys::KernelInfo Sys::getKernelInfo()
 {
     Sys::KernelInfo out;
     struct utsname buf;
     uname(&buf);
+    out.kernelType = KernelType::Darwin;
     out.kernelName = buf.sysname;
-    out.kernelVersion = buf.release;
+    QString release = out.kernelVersion = buf.release;
+
+    // TODO: figure out how to detect cursed-ness (macOS emulated on linux via mad hacks and so on)
+    out.isCursed = false;
+
+    out.kernelMajor = 0;
+    out.kernelMinor = 0;
+    out.kernelPatch = 0;
+    auto sections = release.split('-');
+    if(sections.size() >= 1) {
+        auto versionParts = sections[0].split('.');
+        if(versionParts.size() >= 3) {
+            out.kernelMajor = versionParts[0].toInt();
+            out.kernelMinor = versionParts[1].toInt();
+            out.kernelPatch = versionParts[2].toInt();
+        }
+        else {
+            qWarning() << "Not enough version numbers in " << sections[0] << " found " << versionParts.size();
+        }
+    }
+    else {
+        qWarning() << "Not enough '-' sections in " << release << " found " << sections.size();
+    }
     return out;
 }
 
diff --git a/libraries/systeminfo/src/sys_unix.cpp b/libraries/systeminfo/src/sys_unix.cpp
index 42c0d319..fb96c72c 100644
--- a/libraries/systeminfo/src/sys_unix.cpp
+++ b/libraries/systeminfo/src/sys_unix.cpp
@@ -6,13 +6,41 @@
 #include <fstream>
 #include <limits>
 
+#include <QString>
+#include <QStringList>
+#include <QDebug>
+
 Sys::KernelInfo Sys::getKernelInfo()
 {
     Sys::KernelInfo out;
     struct utsname buf;
     uname(&buf);
+    // NOTE: we assume linux here. this needs further elaboration
+    out.kernelType = KernelType::Linux;
     out.kernelName = buf.sysname;
-    out.kernelVersion = buf.release;
+    QString release = out.kernelVersion = buf.release;
+
+    // linux binary running on WSL is cursed.
+    out.isCursed = release.contains("WSL", Qt::CaseInsensitive) || release.contains("Microsoft", Qt::CaseInsensitive);
+
+    out.kernelMajor = 0;
+    out.kernelMinor = 0;
+    out.kernelPatch = 0;
+    auto sections = release.split('-');
+    if(sections.size() >= 1) {
+        auto versionParts = sections[0].split('.');
+        if(versionParts.size() >= 3) {
+            out.kernelMajor = versionParts[0].toInt();
+            out.kernelMinor = versionParts[1].toInt();
+            out.kernelPatch = versionParts[2].toInt();
+        }
+        else {
+            qWarning() << "Not enough version numbers in " << sections[0] << " found " << versionParts.size();
+        }
+    }
+    else {
+        qWarning() << "Not enough '-' sections in " << release << " found " << sections.size();
+    }
     return out;
 }
 
diff --git a/libraries/systeminfo/src/sys_win32.cpp b/libraries/systeminfo/src/sys_win32.cpp
index a750b3a7..430b87e4 100644
--- a/libraries/systeminfo/src/sys_win32.cpp
+++ b/libraries/systeminfo/src/sys_win32.cpp
@@ -5,12 +5,16 @@
 Sys::KernelInfo Sys::getKernelInfo()
 {
     Sys::KernelInfo out;
+    out.kernelType = KernelType::Windows;
     out.kernelName = "Windows";
     OSVERSIONINFOW osvi;
     ZeroMemory(&osvi, sizeof(OSVERSIONINFOW));
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
     GetVersionExW(&osvi);
     out.kernelVersion = QString("%1.%2").arg(osvi.dwMajorVersion).arg(osvi.dwMinorVersion);
+    out.kernelMajor = osvi.dwMajorVersion;
+    out.kernelMinor = osvi.dwMinorVersion;
+    out.kernelPatch = osvi.dwBuildNumber;
     return out;
 }