From 29c9559a711ec1c935f30d2108c0a7cb625b8bd0 Mon Sep 17 00:00:00 2001
From: ChrisTitusTech <ChrisTitusTech@users.noreply.github.com>
Date: Thu, 9 May 2024 22:21:05 +0000
Subject: [PATCH] Compile Winutil

---
 winutil.ps1 | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/winutil.ps1 b/winutil.ps1
index 547fad43..1fc83807 100644
--- a/winutil.ps1
+++ b/winutil.ps1
@@ -725,32 +725,40 @@ Function Install-WinUtilProgramWinget {
 
     Foreach ($Program in $($ProgramsToInstall -split ",")){
 
-        Write-Progres -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100)
+        Write-Progress -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100)
         if($manage -eq "Installing"){
             # Install package via ID, if it fails try again with different scope and then with an unelevated prompt. 
             # Since Install-WinGetPackage might not be directly available, we use winget install command as a workaround.
             # Winget, not all installers honor any of the following: System-wide, User Installs, or Unelevated Prompt OR Silent Install Mode.
             # This is up to the individual package maintainers to enable these options. Aka. not as clean as Linux Package Managers.
             try {
-                         $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
-                         if(status -eq 0){
-                                write-host "$program installed successfully."
-                                continue
-                         }
-                             Write-Host "Attempt with User scope"
-                         $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --scope user --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
-                         if(status -eq 0){
-                                 Write-Host "$Program installed successfully with User scope."
-                                 continue
-                         }
-                         Write-Host "Attempt with Unelevated prompt"
-                         $status = $(Start-Process -FilePath "powershell" -ArgumentList "-Command Start-Process winget -ArgumentList 'install --id $Program --silent --accept-source-agreements --accept-package-agreements' -Verb runAsUser" -Wait -PassThru).ExitCode
-                         if(status -eq 0){
-                                 Write-Host "$Program installed successfully with Unelevated prompt."
-                                 continue
-                         }
-                         Write-Host "Failed to install $Program."
-                } catch {
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
+                if($status -eq 0){
+                    Write-Host "$Program installed successfully."
+                    continue
+                }
+                Write-Host "Attempt with User scope"
+                $status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --scope user --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
+                if($status -eq 0){
+                    Write-Host "$Program installed successfully with User scope."
+                    continue
+                }
+                Write-Host "Attempt with Unelevated prompt"
+                $process = Start-Process -FilePath "powershell" -ArgumentList "-Command Start-Process winget -ArgumentList 'install --id $Program --silent --accept-source-agreements --accept-package-agreements' -Verb runAsUser" -Wait -PassThru
+                if($process.ExitCode -eq 0){
+                    Write-Host "$Program installed successfully with Unelevated prompt."
+                    continue
+                }
+                Write-Host "Attempting installation with Chocolatey as a fallback method"
+                $chocoStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $Program -y" -Wait -PassThru).ExitCode
+                if($chocoStatus -eq 0){
+                    Write-Host "$Program installed successfully using Chocolatey."
+                    continue
+                } else {
+                    Write-Host "Failed to install $Program using Chocolatey."
+                }
+                Write-Host "Failed to install $Program."
+    } catch {
                 Write-Host "Failed to install $Program due to an error: $_"
                 }
         }