From dfe29be6cb905cd31259abcece43dd6862fcc25a Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sun, 19 Nov 2023 23:44:45 +0100
Subject: [PATCH] DistroInventory added windows support

Fixed bugs in os-Release file parsing
---
 DistroInventory.sh | 23 +++++++++++++++--------
 functions.sh       |  6 +++---
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/DistroInventory.sh b/DistroInventory.sh
index 781b6a4..a52a326 100644
--- a/DistroInventory.sh
+++ b/DistroInventory.sh
@@ -12,7 +12,6 @@ WorkDir=$(dirname $0)
 InventoryFile=$WorkDir/GuestInventory.csv
 #Load functions
 source $WorkDir/functions.sh
-#Create Log folder
 
 #Get what sould be checked
 CheckVM=true
@@ -20,8 +19,8 @@ CheckCT=true
 
 echo "Type,ID,Name,Status,Distro,Version" | tee $InventoryFile
 
-#CT updates
-if $CheckVM; then
+#CT Inventory
+if $CheckCT; then
    TYPE=CT;
    for ID in $(pct list | tail -n+2 | awk '{print $1}'); do
     STATUS=$(pct status $ID |sed 's/status: //')
@@ -33,15 +32,23 @@ if $CheckVM; then
    unset TYPE
 fi
 
-#VM Updates
-if $CheckCT; then
+#VM inventory
+if $CheckVM; then
    TYPE=VM;
    for ID in $(qm list | tail -n+2 | awk '{print $1}'); do
     STATUS=$(qm status $ID |sed 's/status: //')
     NAME=$(qm config $ID | grep name |sed 's/name: //')
-    if  [ $STATUS == "running" ]; then OSRELEASE=$(qm guest exec 2002 -- cat /etc/os-release |jq -r '.["out-data"]')
-    ParseOSRelease
-    unset OSRELEASE ID NAME STATUS DISTRO VERSION
+    OSYPE=$(qm config $ID | grep ostype |sed 's/ostype: //')
+    if  [ $STATUS == "running" ]; then 
+        if [ [$OSYPE == *"win"* ]]; then
+            DISTRO=Windows
+            VERSION=$(qm guest exec $ID "systeminfo"  |jq -r '.["out-data"]'| grep "OS Name" |sed -e 's/OS Name://' -e 's/^[ \t]*//' -e 's/Microsoft Windows//' -e 's/^[ \t]*//')
+        else
+            OSRELEASE=$(qm guest exec $ID -- cat /etc/os-release |jq -r '.["out-data"]')
+            ParseOSRelease
+        fi
+    fi
+    unset OSRELEASE OSYPE ID NAME STATUS DISTRO VERSION
   done
   unset TYPE
 fi
diff --git a/functions.sh b/functions.sh
index bbd7508..3f3de0f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -213,9 +213,9 @@ UpgradeRelease () {
 ParseOSRelease()
 {
     if [ ! -z "$OSRELEASE" ]; then
-        DISTRO=$(printf "$OSRELEASE" | awk -F= '$1=="ID" { print $2 ;}' /etc/os-release)
-        VERSION=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_ID" { print $2 ;}' /etc/os-release |tr -d '"' )
-        VERSIONNAME=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_CODENAME" { print $2 ;}' /etc/os-release)
+        DISTRO=$(printf "$OSRELEASE" | awk -F= '$1=="ID" { print $2 ;}')
+        VERSION=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_ID" { print $2 ;}' |tr -d '"')
+        VERSIONNAME=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_CODENAME" { print $2 ;}')
         if [ ! -z "$VERSIONNAME" ]; then
             VERSION="$VERSION ($VERSIONNAME)" 
         fi