From 3ec03ad26af2e4dbdf114a65c9a34d0bb371b4b1 Mon Sep 17 00:00:00 2001
From: Romanitho <96626929+Romanitho@users.noreply.github.com>
Date: Tue, 18 Jan 2022 23:38:56 +0100
Subject: [PATCH] Add files via upload

---
 winget-update/winget-notify.ps1  |  2 +-
 winget-update/winget-upgrade.ps1 | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/winget-update/winget-notify.ps1 b/winget-update/winget-notify.ps1
index 7c98651..3dcbd55 100644
--- a/winget-update/winget-notify.ps1
+++ b/winget-update/winget-notify.ps1
@@ -1,7 +1,7 @@
 #Send Notif Script
 
 #get xml notif config
-[xml]$NotifConf = Get-Content "$PSScriptRoot\notif.xml" -Encoding UTF8
+[xml]$NotifConf = Get-Content "$PSScriptRoot\notif.xml" -Encoding UTF8 -ErrorAction SilentlyContinue
 if (!($NotifConf)) {break}
 
 #Load Assemblies
diff --git a/winget-update/winget-upgrade.ps1 b/winget-update/winget-upgrade.ps1
index ed16a94..713fc5b 100644
--- a/winget-update/winget-upgrade.ps1
+++ b/winget-update/winget-upgrade.ps1
@@ -92,10 +92,13 @@ function Get-WingetOutdated {
     }
 
     #Get WinGet Location to run as system
-    if (Test-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\AppInstallerCLI.exe"){
+    $WingetCmd = Get-Command winget.exe -ErrorAction SilentlyContinue
+    if ($WingetCmd){
+        $script:upgradecmd = $WingetCmd.Source
+    }
+    elseif (Test-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\AppInstallerCLI.exe"){
         #WinGet < 1.17
         $script:upgradecmd = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\AppInstallerCLI.exe" | Select -ExpandProperty Path
-
     }
     elseif (Test-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe"){
         #WinGet > 1.17
@@ -106,16 +109,20 @@ function Get-WingetOutdated {
         return
     }
 
-    & $upgradecmd upgrade * --accept-source-agreements | Out-Null
+    #Run winget to list apps and accept source agrements (necessary on first run)
+    & $upgradecmd list --accept-source-agreements | Out-Null
+
+    #Get list of available upgrades on winget format
     $upgradeResult = & $upgradecmd upgrade | Out-String
 
+    #Start Convertion of winget format to an array
     if (!($upgradeResult -match "-----")){
         return
     }
 
     $lines = $upgradeResult.Split([Environment]::NewLine)
 
-    # Find the line that starts with ------
+    # Find the line that starts with "------"
     $fl = 0
     while (-not $lines[$fl].StartsWith("-----"))
     {