From 38ec864603692e7a5b5ecaade02b15022a0fa5cd Mon Sep 17 00:00:00 2001
From: Sebastian Hildebrandt <hildebrandt@plus-innovations.com>
Date: Sun, 21 Jan 2024 11:45:58 +0100
Subject: [PATCH] osInfo() improved release parsing (linux)

---
 lib/osinfo.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/osinfo.js b/lib/osinfo.js
index 7f177c7..fd9f88c 100644
--- a/lib/osinfo.js
+++ b/lib/osinfo.js
@@ -243,14 +243,18 @@ function osInfo(callback) {
               release[line.split('=')[0].trim().toUpperCase()] = line.split('=')[1].trim();
             }
           });
+          result.distro = (release.DISTRIB_ID || release.NAME || 'unknown').replace(/"/g, '');
+          result.logofile = getLogoFile(result.distro);
           let releaseVersion = (release.VERSION || '').replace(/"/g, '');
           let codename = (release.DISTRIB_CODENAME || release.VERSION_CODENAME || '').replace(/"/g, '');
+          const prettyName = (release.PRETTY_NAME || '').replace(/"/g, '');
+          if (prettyName.indexOf(result.distro + ' ') === 0) {
+            releaseVersion = prettyName.replace(result.distro + ' ', '').trim();
+          }
           if (releaseVersion.indexOf('(') >= 0) {
             codename = releaseVersion.split('(')[1].replace(/[()]/g, '').trim();
             releaseVersion = releaseVersion.split('(')[0].trim();
           }
-          result.distro = (release.DISTRIB_ID || release.NAME || 'unknown').replace(/"/g, '');
-          result.logofile = getLogoFile(result.distro);
           result.release = (releaseVersion || release.DISTRIB_RELEASE || release.VERSION_ID || 'unknown').replace(/"/g, '');
           result.codename = codename;
           result.codepage = util.getCodepage();