Add files via upload

Romanitho · Jan 18, 2022 · 3ec03ad · 3ec03ad
1 parent ad053ae
commit 3ec03ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -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("-----"))
  {