ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-06-14 02:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restricts manufacturer folder detection to known OEMs

Browse Source 
Improves driver folder discovery logic by explicitly defining recognized manufacturer folder names (Dell, HP, Lenovo, Microsoft) instead of treating any root-level folder with children as a manufacturer folder.

Prevents incorrect categorization of non-manufacturer folders at the root level and ensures only legitimate OEM folders are processed for model-specific driver packages.

Refactors control flow to eliminate else block, improving code clarity and maintainability.
This commit is contained in:
rbalsleyMSFT
2025-11-18 20:03:22 -08:00
parent 9a59b9fea4
commit fc4a71f7e1
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
+19 -13
View File
@@ -1155,6 +1155,7 @@ if ($null -eq $DriverSourcePath) {
# Build folder list that surfaces Manufacturer\Model entries
$DriverFolders = Get-ChildItem -Path $DriversPath -Directory
$driversRootFullPath = (Get-Item -Path $DriversPath).FullName.TrimEnd('\')
$manufacturerFolderNames = @('dell','hp','lenovo','microsoft')
$relativePathResolver = {
param(
[string]$candidatePath,
@@ -1187,8 +1188,13 @@ if ($null -eq $DriverSourcePath) {
}
}
foreach ($driverFolder in $DriverFolders) {
$childModelFolders = Get-ChildItem -Path $driverFolder.FullName -Directory -ErrorAction SilentlyContinue
if (($childModelFolders.Count -gt 0) -and ($driverFolder.Parent.FullName -eq $driversRootFullPath)) {
$parentIsRoot = $driverFolder.Parent.FullName -eq $driversRootFullPath
$folderNameLower = $driverFolder.Name.ToLowerInvariant()
$isManufacturerFolder = $parentIsRoot -and ($manufacturerFolderNames -contains $folderNameLower)
if ($isManufacturerFolder) {
# Only manufacturer folders (Dell/HP/Lenovo/Microsoft) should surface child model folders.
$childModelFolders = Get-ChildItem -Path $driverFolder.FullName -Directory -ErrorAction SilentlyContinue
foreach ($modelFolder in $childModelFolders) {
if (-not (Test-DriverFolderHasInstallableContent -Path $modelFolder.FullName)) {
WriteLog "Skipping driver folder '$($modelFolder.FullName)' because no installable files were found."
@@ -1201,18 +1207,18 @@ if ($null -eq $DriverSourcePath) {
RelativePath = $relativePath
}
}
continue
}
else {
if (-not (Test-DriverFolderHasInstallableContent -Path $driverFolder.FullName)) {
WriteLog "Skipping driver folder '$($driverFolder.FullName)' because no installable files were found."
continue
}
$relativePath = & $relativePathResolver -candidatePath $driverFolder.FullName -rootPath $driversRootFullPath
$DriverSources += [PSCustomObject]@{
Type = 'Folder'
Path = $driverFolder.FullName
RelativePath = $relativePath
}
if (-not (Test-DriverFolderHasInstallableContent -Path $driverFolder.FullName)) {
WriteLog "Skipping driver folder '$($driverFolder.FullName)' because no installable files were found."
continue
}
$relativePath = & $relativePathResolver -candidatePath $driverFolder.FullName -rootPath $driversRootFullPath
$DriverSources += [PSCustomObject]@{
Type = 'Folder'
Path = $driverFolder.FullName
RelativePath = $relativePath
}
}