Merge pull request #129 from JonasKloseBW/2412.3-Add-AppList-Parameter

Add $AppListPath parameter
This commit is contained in:
rbalsleyMSFT
2025-01-13 09:06:37 -08:00
committed by GitHub
+5 -3
View File
@@ -230,6 +230,7 @@ param(
[string]$FFUDevelopmentPath = $PSScriptRoot, [string]$FFUDevelopmentPath = $PSScriptRoot,
[bool]$InstallApps, [bool]$InstallApps,
[string]$AppListPath,
[hashtable]$AppsScriptVariables, [hashtable]$AppsScriptVariables,
[bool]$InstallOffice, [bool]$InstallOffice,
@@ -471,6 +472,7 @@ if ($installationType -eq 'Server'){
2025 { $WindowsVersion = '24H2' } 2025 { $WindowsVersion = '24H2' }
} }
} }
if (-not $AppListPath) { $AppListPath = "$AppsPath\AppList.json" }
#FUNCTIONS #FUNCTIONS
function WriteLog($LogText) { function WriteLog($LogText) {
@@ -4307,9 +4309,9 @@ if ($InstallApps) {
exit exit
} }
WriteLog "$AppsPath\InstallAppsandSysprep.cmd found" WriteLog "$AppsPath\InstallAppsandSysprep.cmd found"
If (Test-Path -Path "$AppsPath\AppList.json"){ If (Test-Path -Path $AppListPath){
WriteLog "$AppsPath\AppList.json found, checking for winget apps to install" WriteLog "$AppListPath found, checking for winget apps to install"
Get-Apps -AppList "$AppsPath\AppList.json" Get-Apps -AppList "$AppListPath"
} }
if (-not $InstallOffice) { if (-not $InstallOffice) {