diff --git a/Get-PC/Data/AppsToIgnore.json b/Get-PC/Data/AppsToIgnore.json deleted file mode 100644 index 5a0825f..0000000 --- a/Get-PC/Data/AppsToIgnore.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "DisplayName": "Hyland Web ActiveX Controls" - }, - { - "DisplayName": "Intel(R) Processor Graphics" - }, - { - "DisplayName": "Microsoft Visual Studio Setup WMI Provider (default)" - }, - { - "DisplayName": "NetSupport Manager" - }, - { - "DisplayName": "Office 16 Click-to-Run Localization Component" - }, - { - "DisplayName": "Realtek Audio COM Components" - }, - { - "DisplayName": "Realtek High Definition Audio Driver" - }, - { - "DisplayName": "Vulkan Run Time Libraries" - }, - { - "DisplayName": "Microsoft Teams Meeting Add-in for Microsoft Office" - }, - { - "DisplayName": "Documentation Manager" - }, - { - "DisplayName": "64 Bit HP CIO Components Installer" - }, - { - "DisplayName": "Teams Machine-Wide Installer" - }, - { - "DisplayName": "Google Legacy Browser Support" - }, - { - "DisplayName": "Maxx Audio Installer" - }, - { - "DisplayName": "Visage 7.1 (64 bit)" - }, - { - "DisplayName": "Microsoft Edge Update" - }, - { - "DisplayName": "Npcap OEM" - }, - { - "DisplayName": "Dell PointStick Driver" - } -] \ No newline at end of file diff --git a/Get-PC/Data/ExpectedApps.json b/Get-PC/Data/ExpectedApps.json deleted file mode 100644 index 49089f3..0000000 Binary files a/Get-PC/Data/ExpectedApps.json and /dev/null differ diff --git a/Get-PC/Private/AppDiff.ps1 b/Get-PC/Private/AppDiff.ps1 index 2f09de2..38002d5 100644 --- a/Get-PC/Private/AppDiff.ps1 +++ b/Get-PC/Private/AppDiff.ps1 @@ -24,11 +24,11 @@ function Get-AppDiff { Write-Progress -Activity "Filtering out standard apps from $pc" -Status 'Removing version numbers and loading reference' -PercentComplete 10 -ParentId 1 $apps = Remove-Version $apps # Open example file - $lookupTablePath = Join-Path (get-item $PSScriptRoot).Parent.FullName 'Data\ExpectedApps.json' - $example = get-content $lookupTablePath | ConvertFrom-Json + $lookupTablePath = Join-Path (get-item $PSScriptRoot).Parent.FullName 'Data\ExpectedApps.txt' + $example = get-content $lookupTablePath # Open file with manually added apps to ignore - $lookupTablePath = Join-Path (get-item $PSScriptRoot).Parent.FullName 'Data\AppsToIgnore.json' - $ignore = get-content $lookupTablePath | ConvertFrom-Json + $lookupTablePath = Join-Path (get-item $PSScriptRoot).Parent.FullName 'Data\AppsToIgnore.txt' + $ignore = get-content $lookupTablePath $exclude = $example + $ignore $output = @() # Finds each app that isn't in the example @@ -43,7 +43,7 @@ function Get-AppDiff { break } } - if ($skip -or $exclude.DisplayName -contains $app.DisplayName) { continue } + if ($skip -or $exclude -contains $app.DisplayName) { continue } $output += $app } @@ -111,7 +111,7 @@ function Get-ExampleApps { $lookupTablePath = Join-Path (get-item $PSScriptRoot).Parent.FullName 'Data\ExpectedApps.json' Copy-FileNoDestruct $lookupTablePath $($lookupTablePath + ".bak") Write-Host "Writing expected apps to" $lookupTablePath - $apps | ConvertTo-Json | Out-File $lookupTablePath + $apps | Out-File $lookupTablePath } if ($examplePC) {