mirror of
https://github.com/ChrisTitusTech/winutil
synced 2026-06-04 22:27:28 +00:00
Cleanup Get-WinUtilSelectedPackages.ps1 and remove annoying messages (#4496)
* Cleanup Get-WinUtilSelectedPackages.ps1 and remove annoying messages * Update Get-WinUtilSelectedPackages.ps1 * Update Get-WinUtilSelectedPackages.ps1 * Update Get-WinUtilSelectedPackages.ps1 * Merge branch 'main' into patch-8 * Update Get-WinUtilSelectedPackages.ps1 * Update Get-WinUtilSelectedPackages.ps1 * Update Get-WinUtilSelectedPackages.ps1 * Update Get-WinUtilSelectedPackages.ps1
This commit is contained in:
@@ -1,18 +1,12 @@
|
|||||||
function Get-WinUtilSelectedPackages
|
function Get-WinUtilSelectedPackages {
|
||||||
{
|
|
||||||
<#
|
|
||||||
.SYNOPSIS
|
|
||||||
Sorts given packages based on installer preference and availability.
|
|
||||||
|
|
||||||
.OUTPUTS
|
param(
|
||||||
Hashtable. Key = Package Manager, Value = ArrayList of packages to install
|
[Parameter(Mandatory = $true)]
|
||||||
#>
|
[object] $PackageList,
|
||||||
param (
|
|
||||||
[Parameter(Mandatory=$true)]
|
[Parameter(Mandatory = $true)]
|
||||||
$PackageList,
|
[PackageManagers] $Preference
|
||||||
[Parameter(Mandatory=$true)]
|
)
|
||||||
[PackageManagers]$Preference
|
|
||||||
)
|
|
||||||
|
|
||||||
if ($PackageList.count -eq 1) {
|
if ($PackageList.count -eq 1) {
|
||||||
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
|
||||||
@@ -23,34 +17,21 @@ function Get-WinUtilSelectedPackages
|
|||||||
$packages = [System.Collections.Hashtable]::new()
|
$packages = [System.Collections.Hashtable]::new()
|
||||||
$packagesWinget = [System.Collections.ArrayList]::new()
|
$packagesWinget = [System.Collections.ArrayList]::new()
|
||||||
$packagesChoco = [System.Collections.ArrayList]::new()
|
$packagesChoco = [System.Collections.ArrayList]::new()
|
||||||
|
|
||||||
$packages[[PackageManagers]::Winget] = $packagesWinget
|
$packages[[PackageManagers]::Winget] = $packagesWinget
|
||||||
$packages[[PackageManagers]::Choco] = $packagesChoco
|
$packages[[PackageManagers]::Choco] = $packagesChoco
|
||||||
|
|
||||||
Write-Debug "Checking packages using Preference '$($Preference)'"
|
|
||||||
|
|
||||||
foreach ($package in $PackageList) {
|
foreach ($package in $PackageList) {
|
||||||
switch ($Preference) {
|
switch ($Preference) {
|
||||||
"Choco" {
|
"Choco" {
|
||||||
if ($package.choco -eq "na") {
|
if ($package.choco -eq "na") {
|
||||||
Write-Debug "$($package.content) has no Choco value."
|
$null = $packagesWinget.add($package.winget)
|
||||||
$null = $packagesWinget.add($($package.winget))
|
|
||||||
Write-Host "Queueing $($package.winget) for WinGet..."
|
|
||||||
} else {
|
} else {
|
||||||
$null = $packagesChoco.add($package.choco)
|
$null = $packagesChoco.add($package.choco)
|
||||||
Write-Host "Queueing $($package.choco) for Chocolatey..."
|
|
||||||
}
|
}
|
||||||
break
|
|
||||||
}
|
}
|
||||||
"Winget" {
|
"Winget" {
|
||||||
if ($package.winget -eq "na") {
|
$null = $packagesWinget.add($package.winget)
|
||||||
Write-Debug "$($package.content) has no WinGet value."
|
|
||||||
$null = $packagesChoco.add($package.choco)
|
|
||||||
Write-Host "Queueing $($package.choco) for Chocolatey..."
|
|
||||||
} else {
|
|
||||||
$null = $packagesWinget.add($($package.winget))
|
|
||||||
Write-Host "Queueing $($package.winget) for WinGet..."
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user