From db0fbfaaf48360b74721ee8ef8c6a637136f1e90 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:08:30 -0800
Subject: [PATCH] Refactor CaptureFFU.ps1 to use $WindowsVersion and
 $WindowsRelease for improved clarity and consistency in FFU naming

---
 .../WinPECaptureFFUFiles/CaptureFFU.ps1       | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1 b/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1
index 17ff85f..986a417 100644
--- a/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1
+++ b/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1
@@ -13,7 +13,7 @@ reg load "HKLM\FFU" $Software
 $SKU = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'EditionID'
 [int]$CurrentBuild = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'CurrentBuild'
 if ($CurrentBuild -notin 14393, 17763) {
-    $DisplayVersion = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'DisplayVersion'
+    $WindowsVersion = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'DisplayVersion'
 }
 $InstallationType = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'InstallationType'
 $BuildDate = Get-Date -uformat %b%Y
@@ -38,60 +38,58 @@ $SKU = switch ($SKU) {
 
 if ($InstallationType -eq "Client") {
     if ($CurrentBuild -ge 22000) {
-        $Name = 'Win11'
+        $WindowsRelease = 'Win11'
     }
     else {
-        $Name = 'Win10'
+        $WindowsRelease = 'Win10'
     }
 }
 else {
-    $Name = switch ($CurrentBuild) {
+    $WindowsRelease = switch ($CurrentBuild) {
         26100 { '2025' }
         20348 { '2022' }
         17763 { '2019' }
         14393 { '2016' }
-        Default { $DisplayVersion }
+        Default { $WindowsVersion }
     }
     if ($InstallationType -eq "Server Core") {
         $SKU += "_Core"
     }
 }
 
-#If Office is installed, modify the file name of the FFU
-#$Office = Get-childitem -Path 'M:\Program Files\Microsoft Office' -ErrorAction SilentlyContinue | Out-Null
-$Office = Get-childitem -Path 'M:\Program Files\Microsoft Office' -ErrorAction SilentlyContinue
-if ($Office) {
-    $ffuFilePath = "W:\$Name`_$DisplayVersion`_$SKU`_Office`_$BuildDate.ffu"
-} else {
-    $ffuFilePath = "W:\$Name`_$DisplayVersion`_$SKU`_Apps`_$BuildDate.ffu"
-}
-$dismArgs = "/capture-ffu /imagefile=$ffuFilePath /capturedrive=\\.\PhysicalDrive0 /name:$Name$DisplayVersion$SKU /Compress:Default"
-
-if (![string]::IsNullOrEmpty($CustomFFUNameTemplate)) {
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{Name}", $Name
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{DisplayVersion}", $DisplayVersion
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{SKU}", $SKU
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{BuildDate}", $BuildDate
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{yyyy}", (Get-Date -UFormat "%Y")
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{MM}", (Get-Date -UFormat "%m")
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{dd}", (Get-Date -UFormat "%d")
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{HH}", (Get-Date -UFormat "%H")
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{hh}", (Get-Date -UFormat "%I")
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{mm}", (Get-Date -UFormat "%M")
-    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace "{tt}", (Get-Date -UFormat "%p")
-
-    if (!$CustomFFUNameTemplate.EndsWith(".ffu")) {
-        $CustomFFUNameTemplate += ".ffu"
+if ($CustomFFUNameTemplate) {
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{WindowsRelease}', $WindowsRelease
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{WindowsVersion}', $WindowsVersion
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{SKU}', $SKU
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{BuildDate}', $BuildDate
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{yyyy}', (Get-Date -UFormat '%Y')
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{MM}', (Get-Date -UFormat '%m')
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{dd}', (Get-Date -UFormat '%d')
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{HH}', (Get-Date -UFormat '%H')
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{hh}', (Get-Date -UFormat '%I')
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{mm}', (Get-Date -UFormat '%M')
+    $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{tt}', (Get-Date -UFormat '%p')
+    if($CustomFFUNameTemplate -notlike '*.ffu') {
+        $CustomFFUNameTemplate += '.ffu'
     }
-
-    $dismArgs = "/capture-ffu /imagefile=W:\$CustomFFUNameTemplate /capturedrive=\\.\PhysicalDrive0 /name:$Name$DisplayVersion$SKU /Compress:Default"
+    $dismArgs = "/capture-ffu /imagefile=W:\$CustomFFUNameTemplate /capturedrive=\\.\PhysicalDrive0 /name:$WindowsRelease$WindowsVersion$SKU /Compress:Default"
+} else {
+    #If Office is installed, modify the file name of the FFU
+    #$Office = Get-childitem -Path 'M:\Program Files\Microsoft Office' -ErrorAction SilentlyContinue | Out-Null
+    $Office = Get-ChildItem -Path 'M:\Program Files\Microsoft Office' -ErrorAction SilentlyContinue
+    if ($Office) {
+        $ffuFilePath = "W:\$WindowsRelease`_$WindowsVersion`_$SKU`_Office`_$BuildDate.ffu"
+    } else {
+        $ffuFilePath = "W:\$WindowsRelease`_$WindowsVersion`_$SKU`_Apps`_$BuildDate.ffu"
+    }
+    $dismArgs = "/capture-ffu /imagefile=$ffuFilePath /capturedrive=\\.\PhysicalDrive0 /name:$WindowsRelease$WindowsVersion$SKU /Compress:Default"
 }
 
 #Unload Registry
 Set-Location X:\
 Remove-Variable SKU
 if ($CurrentBuild -notin 14393, 17763) {
-    Remove-Variable DisplayVersion
+    Remove-Variable WindowsVersion
 }
 Remove-Variable CurrentBuild
 Remove-Variable Office
@@ -102,5 +100,4 @@ Start-sleep 60
 Start-Process -FilePath dism.exe -ArgumentList $dismArgs -Wait -PassThru -ErrorAction Stop | Out-Null
 #Copy DISM log to Host
 xcopy X:\Windows\logs\dism\dism.log W:\ /Y | Out-Null
-
 wpeutil Shutdown