big update

Fix-WindowsHealth.ps1

@@ -1,39 +1,27 @@
-## Run enhanced DISM for Windows 8 and higher endpoints
+# Run the System File Checker to scan for and repair any problems with protected system files
+LogMsg "Running System File Checker"
+$SFCOutput = $(sfc /scannow) | Out-String
+LogMsg $SFCOutput
+
+# Run enhanced DISM for Windows 8 and higher endpoints
 If ( IsWindowsVersion -ge "6.2" )
 {
-    LogMsg "Fix-WindowsHealth.ps1"
-
     $BeginDISMRun = $(Get-Date).AddSeconds(-1)
 
-    ## Scan the Windows Component Store for problems
-    LogMsg "Beginning Windows Component Store scan"
-    Start-Process "dism.exe" -ArgumentList "/online /cleanup-image /scanhealth" -Wait
-    LogMsg "Completed Windows Component Store scan"
+    LogMsg "Beginning repair of Windows Component Store"
+    StartProcess "dism.exe" -ArgumentList "/online /cleanup-image /restorehealth" -Wait
 
-    ## Check to see if the previous command recorded any problems that need repairing
-    LogMsg "Beginning Windows Component Store health check"
-    $CheckHealthOutput = $(dism /online /cleanup-image /checkhealth) | Out-String
-    If ( $CheckHealthOutput -match "repairable" )
-    {    
-        LogMsg "Completed Windows Component Store health check: Problems found"
-        
-        ## Repair problems with the Windows Component Store
-        LogMsg "Beginning Windows Component Store restoration"
-        Start-Process "dism.exe" -ArgumentList "/online /cleanup-image /restorehealth" -Wait
-        LogMsg "Completed Windows Component Store restoration"
-    }
-    Else { LogMsg "Completed Windows Component Store health check: No problems found" }
+    LogMsg "Beginning cleanup of superceded components in Windows Component Store"
+    StartProcess "dism.exe" -ArgumentList "/online /cleanup-image /startcomponentcleanup"
 
     $EndDISMRun = $(Get-Date).AddSeconds(1)
 
-    ## Parse DISM log file for recent activity
-    $DISMLogFile = "${MSPLogs}\Fix-WindowsHealth_DISM.log"
-    If ( Test-Path $DISMLogFile ) { Remove-Item $DISMLogFile -Force }
-    New-Item -Path $DISMLogFile -ItemType File
+    # Adding results of DISM log file to this log file
     LogMsg "Beginning Windows Component Store log data collection"
     Get-Content -Path "${Env:WinDir}\Logs\DISM\dism.log" | Select-String -Pattern '^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})' |
-        % { If ( ((Get-Date $_.Line.Substring(0,19)) -gt $BeginDISMRun) -and ((Get-Date $_.Line.Substring(0,19)) -le $EndDISMRun) ) {
-            Add-Content -Path $DISMLogFile -Value $_.Line
+        ForEach-Object {
+            If ( ((Get-Date $_.Line.Substring(0,19)) -gt $BeginDISMRun) -and ((Get-Date $_.Line.Substring(0,19)) -le $EndDISMRun) ) {
+            LogMsg $_.Line
         }
     }
     LogMsg "Completed Windows Component Store log data collection"