using a default blacklist instead
parent
2eac70cc64
commit
8c0c94cc4e
|
@ -4,21 +4,20 @@ function Get-ExcludedApps {
|
|||
|
||||
$AppIDs = @()
|
||||
|
||||
#region blacklist in registry
|
||||
#blacklist in registry
|
||||
if ($GPOList) {
|
||||
|
||||
Write-ToLog "-> Excluded apps from GPO is activated"
|
||||
if (Test-Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList") {
|
||||
$ValueNames = (Get-Item -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList").Property
|
||||
|
||||
foreach ($ValueName in $ValueNames) {
|
||||
$AppIDs += (Get-ItemPropertyValue -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList" -Name $ValueName).Trim()
|
||||
}
|
||||
|
||||
Write-ToLog "-> Successsfully loaded excluded apps list."
|
||||
}
|
||||
|
||||
}
|
||||
#endregion blacklist in registry
|
||||
#region blacklist pulled from URI
|
||||
#blacklist pulled from URI
|
||||
elseif ($URIList) {
|
||||
|
||||
$RegPath = "$WAU_GPORoot";
|
||||
|
@ -27,6 +26,7 @@ function Get-ExcludedApps {
|
|||
if (Test-Path -Path $RegPath) {
|
||||
$RegKey = Get-Item -Path $RegPath;
|
||||
$WAUURI = $RegKey.GetValue($RegValueName);
|
||||
Write-ToLog "-> Excluded apps from URI is activated"
|
||||
if ($null -ne $WAUURI) {
|
||||
$resp = Invoke-WebRequest -Uri $WAUURI -UseDefaultCredentials;
|
||||
if ($resp.BaseResponse.StatusCode -eq [System.Net.HttpStatusCode]::OK) {
|
||||
|
@ -34,17 +34,26 @@ function Get-ExcludedApps {
|
|||
ForEach-Object {
|
||||
$AppIds += $_
|
||||
}
|
||||
Write-ToLog "-> Successsfully loaded excluded apps list."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endregion blacklist pulled from URI
|
||||
#blacklist pulled from local file
|
||||
elseif (Test-Path "$WorkingDir\excluded_apps.txt") {
|
||||
|
||||
return (Get-Content -Path "$WorkingDir\excluded_apps.txt").Trim() | Where-Object { $_.length -gt 0 }
|
||||
$AppIDs = (Get-Content -Path "$WorkingDir\excluded_apps.txt").Trim() | Where-Object { $_.length -gt 0 }
|
||||
Write-ToLog "-> Successsfully loaded local excluded apps list."
|
||||
|
||||
}
|
||||
#blacklist pulled from default file
|
||||
elseif (Test-Path "$WorkingDir\config\default_excluded_apps.txt") {
|
||||
|
||||
$AppIDs = (Get-Content -Path "$WorkingDir\config\default_excluded_apps.txt").Trim() | Where-Object { $_.length -gt 0 }
|
||||
Write-ToLog "-> Successsfully loaded default excluded apps list."
|
||||
|
||||
}
|
||||
|
||||
return $AppIDs | Where-Object { $_.length -gt 0 }
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue