From 49b742b47b22679b9ae5f307a7a6e806dcda5269 Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Fri, 2 Aug 2024 11:35:18 -0400
Subject: [PATCH 1/5] Added Logic for FFU Selection to Check for Integer or 'A'

Fix Write Message to Display all FFUs found if not
using -Verbose, currently displays nothing so numbering
of FFUs is unkown for selection prompt

Added Simple total Runtime and Start and Finish Time
---
 FFUDevelopment/BuildFFUVM.ps1 | 139 +++++++++++++++++++++++-----------
 1 file changed, 96 insertions(+), 43 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 5d8b058..50b3bb5 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -2616,7 +2616,7 @@ function New-PEMedia {
         #Remove-Item -Path "$WinPEFFUPath\media\boot\bootfix.bin" -Force | Out-null
         # $WinPEISOName = 'WinPE_FFU_Capture.iso'
         $WinPEISOFile = $CaptureISO
-        # $Capture = $false
+        $Capture = $false
     }
     If ($Deploy) {
         WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
@@ -2636,7 +2636,7 @@ function New-PEMedia {
         # $WinPEISOName = 'WinPE_FFU_Deploy.iso'
         $WinPEISOFile = $DeployISO
 
-        # $Deploy = $false
+        $Deploy = $false
     }
     WriteLog 'Dismounting WinPE media' 
     Dismount-WindowsImage -Path "$WinPEFFUPath\mount" -Save | Out-Null
@@ -2652,21 +2652,11 @@ function New-PEMedia {
     WriteLog "Creating WinPE ISO at $WinPEISOFile"
     # & "$OSCDIMG" -m -o -u2 -udfver102 -bootdata:2`#p0,e,b$OSCDIMGPath\etfsboot.com`#pEF,e,b$OSCDIMGPath\Efisys_noprompt.bin $WinPEFFUPath\media $FFUDevelopmentPath\$WinPEISOName | Out-null
     if($WindowsArch -eq 'x64'){
-        if($Capture){
-            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
-        }
-        if($Deploy){
-            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
-        }
+        $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
+    
     }
     elseif($WindowsArch -eq 'arm64'){
-        if($Capture){
-            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
-        }
-        if($Deploy){
-            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
-        }
-        
+        $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
     }
     Invoke-Process $OSCDIMG $OSCDIMGArgs
     WriteLog "ISO created successfully"
@@ -2959,7 +2949,14 @@ Function Get-USBDrive {
                 
 
                 if ($selectedIndex -ge 0 -and $selectedIndex -lt $ExternalHardDiskDrives.Count) {
-                    $USBDrives = $ExternalHardDiskDrives[$selectedIndex]
+                    if ($ExternalDisk.OperationalStatus -eq 'Offline') {
+                        Write-Warning "Selected Drive is in an Offline State. Please check the drive status in Disk Manager and try again."
+                        exit 1
+                    }
+                    else {
+                        $USBDrives = $ExternalHardDiskDrives[$selectedIndex]
+                    }
+                    
                 } else {
                     Write-Warning "Invalid selection. Exiting." | Out-Null
                     exit 1
@@ -2996,35 +2993,74 @@ Function New-DeploymentUSB {
     WriteLog "BuildUSBPath is $BuildUSBPath"
 
     $SelectedFFUFile = $null
-
+    
     if ($CopyFFU.IsPresent) {
         $FFUFiles = Get-ChildItem -Path "$BuildUSBPath\FFU" -Filter "*.ffu"
 
-        if ($FFUFiles.Count -eq 1) {
-            $SelectedFFUFile = $FFUFiles.FullName
-        }
-        elseif ($FFUFiles.Count -gt 1) {
-            WriteLog 'Found multiple FFU files'
-            for ($i = 0; $i -lt $FFUFiles.Count; $i++) {
-                WriteLog ("{0}: {1}" -f ($i + 1), $FFUFiles[$i].Name)
-            }
-            $inputChoice = Read-Host "Enter the number corresponding to the FFU file you want to copy or 'A' to copy all FFU files"
-            
-            if ($inputChoice -eq 'A') {
-                $SelectedFFUFile = $FFUFiles.FullName
-            }
-            elseif ($inputChoice -ge 1 -and $inputChoice -le $FFUFiles.Count) {
-                $selectedIndex = $inputChoice - 1
-                $SelectedFFUFile = $FFUFiles[$selectedIndex].FullName
-            }
-            WriteLog "$SelectedFFUFile was selected"
-        }
-        else {
-            WriteLog "No FFU files found in the current directory."
-            Write-Error "No FFU files found in the current directory."
-            Return
-        }
-    }
+
+         if (-not $FFUFiles) {
+        # WriteLog "No FFU files found in the current directory."
+         Write-Error "No FFU files found in the current directory."
+         Return
+         }
+     
+         elseif ($FFUFiles.Count -eq 1) {
+             $SelectedFFUFile = $FFUFiles.FullName
+         }
+         elseif ($FFUFiles.Count -gt 1) {
+             WriteLog 'Found multiple FFU files'
+             Write-Warning 'Found multiple FFU files'
+             for ($i = 0; $i -lt $FFUFiles.Count; $i++) {
+                 WriteLog ("FFU {0}: {1}   Modified: {2}" -f ($i + 1), $FFUFiles[$i].Name, $FFUFiles[$i].LastWriteTime)
+                 if ($VerbosePreference -ne 'Continue') {
+                    Write-Host ("FFU {0}: {1}   Modified: {2}" -f ($i + 1), $FFUFiles[$i].Name, $FFUFiles[$i].LastWriteTime) -ForegroundColor Green
+                 }
+                
+             }
+             #$inputChoice = Read-Host "Enter the number corresponding to the FFU file you want to copy or 'A' to copy all FFU files"
+             $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
+             
+             Write-Host "You selected FFU: $inputChoice"
+             WriteLog "You selected FFU: $inputChoice"
+             
+             while ($true) {
+                     if ($inputChoice -eq 'A') {
+                         $SelectedFFUFile = $FFUFiles.FullName
+                         Write-Host "You selected $inputChoice"
+                         break
+                     }
+     
+                     try {
+                        
+                       #  $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
+             
+                         # Convert the input to a float
+                         $ISnumber = [float]$inputChoice
+             
+                         # Display the entered number for debuggin
+                         #Write-Host "You selected Disk: $ISnumber"
+                                        
+                     }
+                     catch {
+                         # If the input is not a valid number, display an error message
+                         Write-Host "Invalid input. Please try again."
+                       
+                     }
+                     if ($inputChoice -ge 1 -and $inputChoice -le $FFUFiles.Count) {
+                         $selectedIndex = $inputChoice - 1
+                         Write-Host "You Selected FFU $selectedIndex"
+                         $SelectedFFUFile = $FFUFiles[$selectedIndex].FullName
+                         break
+                     }
+                     else{
+                        Write-Host "Invalid FFU Number. Please try again."
+                        $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
+                       }
+                 }   
+             WriteLog "$SelectedFFUFile was selected"
+             Write-Host "$SelectedFFUFile was selected"
+         }
+    }     
     $counter = 0
 
     foreach ($USBDrive in $USBDrives) {
@@ -3314,7 +3350,9 @@ function Clear-InstallAppsandSysprep {
 if (Test-Path -Path $Logfile) {
     Remove-item -Path $LogFile -Force
 }
-Write-Host "FFU build process has begun. This process can take 20 minutes or more. Please do not close this window or any additional windows that pop up"
+$startTime = Get-Date
+Write-Host "FFU build process has begun at" $startTime -ForegroundColor DarkYellow
+Write-Host "This process can take 20 minutes or more. Please do not close this window or any additional windows that pop up"
 Write-Host "To track progress, please open the log file $Logfile or use the -Verbose parameter next time"
 
 WriteLog 'Begin Logging'
@@ -3968,4 +4006,19 @@ Remove-Item -Path .\dirty.txt -Force | out-null
 if ($VerbosePreference -ne 'Continue'){
     Write-Host 'Script complete'
 }
+# Record the end time
+$endTime = Get-Date
+Write-Host "FFU build process has completed at" $endTime -ForegroundColor DarkYellow
+
+# Calculate the total run time
+$runTime = $endTime - $startTime
+$runTimeInMinutes = [math]::Round($runTime.TotalMinutes, 2)
+
+# Format the runtime as minutes and seconds
+$runTimeFormatted = 'Duration: {0:mm} min {0:ss} sec' -f $runTime
+
+Write-Host $runTimeFormatted -ForegroundColor DarkGreen
+
+
+
 WriteLog 'Script complete'

From 1bfc4735d3c4c18dae5628afc356ff6c9a905b61 Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Fri, 2 Aug 2024 11:52:51 -0400
Subject: [PATCH 2/5] Sync arm64 changes and Rem $Capture  False

---
 FFUDevelopment/BuildFFUVM.ps1 | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 50b3bb5..49f0429 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -2616,7 +2616,7 @@ function New-PEMedia {
         #Remove-Item -Path "$WinPEFFUPath\media\boot\bootfix.bin" -Force | Out-null
         # $WinPEISOName = 'WinPE_FFU_Capture.iso'
         $WinPEISOFile = $CaptureISO
-        $Capture = $false
+        # $Capture = $false
     }
     If ($Deploy) {
         WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
@@ -2636,7 +2636,7 @@ function New-PEMedia {
         # $WinPEISOName = 'WinPE_FFU_Deploy.iso'
         $WinPEISOFile = $DeployISO
 
-        $Deploy = $false
+        # $Deploy = $false
     }
     WriteLog 'Dismounting WinPE media' 
     Dismount-WindowsImage -Path "$WinPEFFUPath\mount" -Save | Out-Null
@@ -2652,11 +2652,21 @@ function New-PEMedia {
     WriteLog "Creating WinPE ISO at $WinPEISOFile"
     # & "$OSCDIMG" -m -o -u2 -udfver102 -bootdata:2`#p0,e,b$OSCDIMGPath\etfsboot.com`#pEF,e,b$OSCDIMGPath\Efisys_noprompt.bin $WinPEFFUPath\media $FFUDevelopmentPath\$WinPEISOName | Out-null
     if($WindowsArch -eq 'x64'){
-        $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
-    
+        if($Capture){
+            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
+        }
+        if($Deploy){
+            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
+        }
     }
     elseif($WindowsArch -eq 'arm64'){
-        $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
+        if($Capture){
+            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
+        }
+        if($Deploy){
+            $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
+        }
+        
     }
     Invoke-Process $OSCDIMG $OSCDIMGArgs
     WriteLog "ISO created successfully"

From e3bec5ff4507a3424325208cda0c68564ed443f3 Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Fri, 2 Aug 2024 12:02:58 -0400
Subject: [PATCH 3/5] Clean up some Remmed Lines and Added some Comments for
 explanation

---
 FFUDevelopment/BuildFFUVM.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 49f0429..1bf1021 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -2946,7 +2946,7 @@ Function Get-USBDrive {
                             # Convert the input to a float
                             $ISnumber = [float]$inputChoice
                 
-                            # Display the entered number
+                            # Display the entered number used for Debugging
                             Write-Host "You selected Disk: $ISnumber"
                             $selectedIndex = $inputChoice - 1
                             break
@@ -2959,7 +2959,8 @@ Function Get-USBDrive {
                 
 
                 if ($selectedIndex -ge 0 -and $selectedIndex -lt $ExternalHardDiskDrives.Count) {
-                    if ($ExternalDisk.OperationalStatus -eq 'Offline') {
+                    #Check if Selected Drive is in an Offline State. Useful when presenting the FFU Driv to Hyper-V VMs and forget to Online Again
+                    if ($ExternalDisk.OperationalStatus -eq 'Offline') { 
                         Write-Warning "Selected Drive is in an Offline State. Please check the drive status in Disk Manager and try again."
                         exit 1
                     }
@@ -3041,9 +3042,7 @@ Function New-DeploymentUSB {
                      }
      
                      try {
-                        
-                       #  $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
-             
+                      
                          # Convert the input to a float
                          $ISnumber = [float]$inputChoice
              
@@ -3062,7 +3061,8 @@ Function New-DeploymentUSB {
                          $SelectedFFUFile = $FFUFiles[$selectedIndex].FullName
                          break
                      }
-                     else{
+                     else{ 
+                        #No correct input so prompt again and repeat Checks.
                         Write-Host "Invalid FFU Number. Please try again."
                         $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
                        }

From 9de55eb18634881347889bd040f0b92b84dcb641 Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Fri, 2 Aug 2024 12:11:54 -0400
Subject: [PATCH 4/5] Comment Better

---
 FFUDevelopment/BuildFFUVM.ps1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 1bf1021..39a3b24 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -3035,6 +3035,7 @@ Function New-DeploymentUSB {
              WriteLog "You selected FFU: $inputChoice"
              
              while ($true) {
+                    #If 'A' is selected copy all the FFUs found
                      if ($inputChoice -eq 'A') {
                          $SelectedFFUFile = $FFUFiles.FullName
                          Write-Host "You selected $inputChoice"
@@ -3043,7 +3044,7 @@ Function New-DeploymentUSB {
      
                      try {
                       
-                         # Convert the input to a float
+                         # Try to Convert the inputChoice to a float
                          $ISnumber = [float]$inputChoice
              
                          # Display the entered number for debuggin
@@ -3051,10 +3052,11 @@ Function New-DeploymentUSB {
                                         
                      }
                      catch {
-                         # If the input is not a valid number, display an error message
+                         # If inputChoice is not a valid number, must have been a character, so display an error message
                          Write-Host "Invalid input. Please try again."
                        
                      }
+                     # If InputChoice is a number check that its withing the range of 
                      if ($inputChoice -ge 1 -and $inputChoice -le $FFUFiles.Count) {
                          $selectedIndex = $inputChoice - 1
                          Write-Host "You Selected FFU $selectedIndex"
@@ -3062,7 +3064,7 @@ Function New-DeploymentUSB {
                          break
                      }
                      else{ 
-                        #No correct input so prompt again and repeat Checks.
+                        #No correct input for FFU selection, so prompt again and repeat Checks.
                         Write-Host "Invalid FFU Number. Please try again."
                         $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
                        }

From 213da613894e4ff76e75ad525ddf80c24bc107ac Mon Sep 17 00:00:00 2001
From: Doctair <centit@outlook.com>
Date: Fri, 2 Aug 2024 12:20:17 -0400
Subject: [PATCH 5/5] Fix REad-Host Prompt message for FFU selecion

---
 FFUDevelopment/BuildFFUVM.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 39a3b24..a17af1d 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -3029,7 +3029,7 @@ Function New-DeploymentUSB {
                 
              }
              #$inputChoice = Read-Host "Enter the number corresponding to the FFU file you want to copy or 'A' to copy all FFU files"
-             $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
+             $inputChoice = $(Write-Host "Enter the number corresponding to the FFU file you want to copy or 'A' to copy all FFU files: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
              
              Write-Host "You selected FFU: $inputChoice"
              WriteLog "You selected FFU: $inputChoice"
@@ -3066,7 +3066,7 @@ Function New-DeploymentUSB {
                      else{ 
                         #No correct input for FFU selection, so prompt again and repeat Checks.
                         Write-Host "Invalid FFU Number. Please try again."
-                        $inputChoice = $(Write-Host "Enter the number corresponding to the external hard disk media drive you want to use: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
+                        $inputChoice = $(Write-Host "Enter the number corresponding to the FFU file you want to copy or 'A' to copy all FFU files: " -ForegroundColor DarkYellow -NoNewline; Read-Host)
                        }
                  }   
              WriteLog "$SelectedFFUFile was selected"