Merge pull request #672 from Romanitho/msi-prerequisites

[MSI Prerequisites] Check for msi version as well during WAU update
Romanitho · Sep 1, 2024 · 471b836 · 471b836
2 parents d9837a3 + 77dcf1b
commit 471b836
Showing 1 changed file with 34 additions and 7 deletions.
diff --git a/Sources/WAU/Winget-AutoUpdate/functions/Update-WAU.ps1 b/Sources/WAU/Winget-AutoUpdate/functions/Update-WAU.ps1
@@ -13,13 +13,14 @@ function Update-WAU {
 
     #Run WAU update
     try {
+        #Try WAU.zip (v1)
 
         #Force to create a zip file
         $ZipFile = "$WorkingDir\WAU_update.zip"
         New-Item $ZipFile -ItemType File -Force | Out-Null
 
         #Download the zip
-        Write-ToLog "Downloading the GitHub Repository version $WAUAvailableVersion" "Cyan"
+        Write-ToLog "Downloading the GitHub Repository Zip version $WAUAvailableVersion" "Cyan"
         Invoke-RestMethod -Uri "https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v$($WAUAvailableVersion)/WAU.zip" -OutFile $ZipFile
 
         #Extract Zip File
@@ -68,13 +69,39 @@ function Update-WAU {
 
     catch {
 
-        #Send Error Notif
-        $Title = $NotifLocale.local.outputs.output[4].title -f "Winget-AutoUpdate"
-        $Message = $NotifLocale.local.outputs.output[4].message
-        $MessageType = "error"
-        Start-NotifTask -Title $Title -Message $Message -MessageType $MessageType -Button1Action $OnClickAction -Button1Text $Button1Text
-        Write-ToLog "WAU Update failed" "Red"
+        #Try WAU.msi (v2)
+        try {
+            #Download the msi
+            Write-ToLog "Downloading the GitHub Repository MSI version $WAUAvailableVersion" "Cyan"
+            $MsiFile = "$env:temp\WAU.msi"
+            Invoke-RestMethod -Uri "https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v$($WAUAvailableVersion)/WAU.msi" -OutFile $MsiFile
+
+
+
+            #Update WAU and run
+            Write-ToLog "Updating WAU..." "Yellow"
+            Start-Process msiexec.exe -ArgumentList "/i $MsiFile /qn /L*v ""$WorkingDir\logs\WAU-Installer.log"" RUN_WAU=YES" -Wait
+
+            #Send success Notif
+            Write-ToLog "WAU Update completed. Rerunning WAU..." "Green"
+            $Title = $NotifLocale.local.outputs.output[3].title -f "Winget-AutoUpdate"
+            $Message = $NotifLocale.local.outputs.output[3].message -f $WAUAvailableVersion
+            $MessageType = "success"
+            Start-NotifTask -Title $Title -Message $Message -MessageType $MessageType -Button1Action $OnClickAction -Button1Text $Button1Text
 
+            Exit 0
+        }
+
+        catch {
+
+            #Send Error Notif
+            $Title = $NotifLocale.local.outputs.output[4].title -f "Winget-AutoUpdate"
+            $Message = $NotifLocale.local.outputs.output[4].message
+            $MessageType = "error"
+            Start-NotifTask -Title $Title -Message $Message -MessageType $MessageType -Button1Action $OnClickAction -Button1Text $Button1Text
+            Write-ToLog "WAU Update failed" "Red"
+
+        }
     }
 
 }