diff --git a/functions/private/Install-WinUtilProgramChoco.ps1 b/functions/private/Install-WinUtilProgramChoco.ps1 index b87f4c3f..b58ddb78 100644 --- a/functions/private/Install-WinUtilProgramChoco.ps1 +++ b/functions/private/Install-WinUtilProgramChoco.ps1 @@ -14,11 +14,11 @@ function Install-WinUtilProgramChoco { #> param( - [Parameter(Mandatory, Position=0)] - [PsCustomObject]$ProgramsToInstall, + [Parameter(Mandatory, Position=0)] + [PsCustomObject]$ProgramsToInstall, - [Parameter(Mandatory, Position=1)] - [String]$manage = "Installing" + [Parameter(Position=1)] + [String]$manage = "Installing" ) $x = 0 @@ -31,7 +31,7 @@ function Install-WinUtilProgramChoco { Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0 Write-Host "===========================================" - Write-Host "-- insstalling Chocolatey pacakages ---" + Write-Host "-- Configuring Chocolatey pacakages ---" Write-Host "===========================================" Foreach ($Program in $ProgramsToInstall){ Write-Progress -Activity "$manage Applications" -Status "$manage $($Program.choco) $($x + 1) of $count" -PercentComplete $($x/$count*100) @@ -40,13 +40,14 @@ function Install-WinUtilProgramChoco { try{ $tryUpgrade = $false $installOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.install-command.output.txt" + New-Item -ItemType File -Path $installOutputFilePath $chocoInstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $($Program.choco) -y" -Wait -PassThru -RedirectStandardOutput $installOutputFilePath).ExitCode - if(($chocoInstallStatus -eq 0) -AND (Test-Path -Path $outputFilePath)) { - $keywordsFound = Get-Content -Path $outputFilePath | Where {$_ -match "reinstall" -OR $_ -match "already installed"} - if ($keywordsFound) { - $tryUpgrade = $true - } - } + if(($chocoInstallStatus -eq 0) -AND (Test-Path -Path $installOutputFilePath)) { + $keywordsFound = Get-Content -Path $installOutputFilePath | Where-Object {$_ -match "reinstall" -OR $_ -match "already installed"} + if ($keywordsFound) { + $tryUpgrade = $true + } + } # TODO: Implement the Upgrade part using 'choco upgrade' command, this will make choco consistent with WinGet, as WinGet tries to Upgrade when you use the install command. if ($tryUpgrade) { throw "Automatic Upgrade for Choco isn't implemented yet, a feature to make it consistent with WinGet, the install command using choco simply failed because $($Program.choco) is already installed." @@ -66,6 +67,7 @@ function Install-WinUtilProgramChoco { write-host "Starting uninstall of $($Program.choco) with Chocolatey." try{ $uninstallOutputFilePath = "$env:TEMP\Install-WinUtilProgramChoco.uninstall-command.output.txt" + New-Item -ItemType File -Path $uninstallOutputFilePath $chocoUninstallStatus = $(Start-Process -FilePath "choco" -ArgumentList "uninstall $($Program.choco) -y" -Wait -PassThru).ExitCode if($chocoUninstallStatus -eq 0){ Write-Host "$($Program.choco) uninstalled successfully using Chocolatey." @@ -82,8 +84,8 @@ function Install-WinUtilProgramChoco { Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed # Cleanup leftovers files - Remove-Item -Path $installOutputFilePath - Remove-Item -Path $uninstallOutputFilePath + if(Test-Path -Path $installOutputFilePath){ Remove-Item -Path $installOutputFilePath } + if(Test-Path -Path $installOutputFilePath){ Remove-Item -Path $uninstallOutputFilePath } return; } diff --git a/functions/private/Install-WinUtilProgramWinget.ps1 b/functions/private/Install-WinUtilProgramWinget.ps1 index d26ba9a3..565d23ba 100644 --- a/functions/private/Install-WinUtilProgramWinget.ps1 +++ b/functions/private/Install-WinUtilProgramWinget.ps1 @@ -15,15 +15,18 @@ Function Install-WinUtilProgramWinget { #> param( - $ProgramsToInstall, - $manage = "Installing" + [Parameter(Mandatory, Position=0)] + [PsCustomObject]$ProgramsToInstall, + + [Parameter(Position=1)] + [String]$manage = "Installing" ) $x = 0 $count = $ProgramsToInstall.Count Write-Progress -Activity "$manage Applications" -Status "Starting" -PercentComplete 0 Write-Host "===========================================" - Write-Host "-- installing winget packages ---" + Write-Host "-- Configuring winget packages ---" Write-Host "===========================================" Foreach ($Program in $ProgramsToInstall){ $failedPackages = @() @@ -60,9 +63,11 @@ Function Install-WinUtilProgramWinget { Write-Host "$($Program.winget) installed successfully with User prompt." continue } + Write-Host "Failed to install $($Program.winget). With winget" + $failedPackages += $Program } catch { Write-Host "Failed to install $($Program.winget). With winget" - $failedPackages += $($Program.winget) + $failedPackages += $Program } } if($manage -eq "Uninstalling"){ @@ -73,11 +78,11 @@ Function Install-WinUtilProgramWinget { Write-Host "Failed to uninstall $($Program.winget)." } else { Write-Host "$($Program.winget) uninstalled successfully." - $failedPackages += $($Program.winget) + $failedPackages += $Program } } catch { Write-Host "Failed to uninstall $($Program.winget) due to an error: $_" - $failedPackages += $($Program.winget) + $failedPackages += $Program } } $X++ diff --git a/functions/public/Invoke-WPFUnInstall.ps1 b/functions/public/Invoke-WPFUnInstall.ps1 index facd7155..e7ba2b08 100644 --- a/functions/public/Invoke-WPFUnInstall.ps1 +++ b/functions/public/Invoke-WPFUnInstall.ps1 @@ -50,10 +50,10 @@ function Invoke-WPFUnInstall { # Install all selected programs in new window if($packagesWinget.Count -gt 0){ - Install-WinUtilProgramWinget -ProgramsToInstall $PackagesToInstall -Manage "Uninstalling" + Install-WinUtilProgramWinget -ProgramsToInstall $packagesWinget -Manage "Uninstalling" } if($packagesChoco.Count -gt 0){ - Install-WinUtilProgramChoco -ProgramsToInstall $PackagesToInstall -Manage "Uninstalling" + Install-WinUtilProgramChoco -ProgramsToInstall $packagesChoco -Manage "Uninstalling" } $ButtonType = [System.Windows.MessageBoxButton]::OK @@ -69,7 +69,7 @@ function Invoke-WPFUnInstall { } Catch { Write-Host "===========================================" - Write-Host "-- Winget failed to install ---" + Write-Host "Error: $_" Write-Host "===========================================" } $sync.ProcessRunning = $False