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

Removed Get-MSRTUrl function and use Microsoft Update Catalog to retrieve latest MSRT

Browse Source
This commit is contained in:
Zehadi Alam
2024-09-23 23:42:09 -04:00
parent ec7e9a546c
commit c93c417dba
1 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/BuildFFUVM.ps1
+3 -45
View File
@@ -2314,39 +2314,6 @@ function Save-KB {
return $fileName return $fileName
} }
function Get-MSRTUrl {
param (
[ValidateSet("x86", "x64")]
[string]$WindowsArch
)
try {
# Retrieve content of Windows Malicious Software Removal Tool page
$pattern = 'https:\/\/download\.microsoft\.com\/download\/[^\s]*\.exe'
$OriginalVerbosePreference = $VerbosePreference
$VerbosePreference = 'SilentlyContinue'
if ($WindowsArch -eq "x64") {
$MSRTWebPage = Invoke-RestMethod "https://www.microsoft.com/en-us/download/details.aspx?id=9905" -Headers $Headers -UserAgent $UserAgent
}
if ($WindowsArch -eq "x86") {
$MSRTWebPage = Invoke-RestMethod "https://www.microsoft.com/en-us/download/details.aspx?id=16" -Headers $Headers -UserAgent $UserAgent
}
$VerbosePreference = $OriginalVerbosePreference
# Extract download URL based on specified pattern
$MSRTMatch = [regex]::Match($MSRTWebPage, $pattern)
if (-not $MSRTMatch.Success) {
WriteLog "Failed to retrieve Malicious Software Removal Tool URL. Pattern match failed"
return
}
$MSRTUrl = $MSRTMatch.Value
return $MSRTUrl
}
catch {
WriteLog $_
Write-Error "Error occurred while retrieving Windows Malicious Software Removal Tool link"
throw $_
}
}
function New-AppsISO { function New-AppsISO {
#Create Apps ISO file #Create Apps ISO file
$OSCDIMG = "$adkpath`Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg\oscdimg.exe" $OSCDIMG = "$adkpath`Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg\oscdimg.exe"
@@ -3949,24 +3916,15 @@ if ($InstallApps) {
} }
if ($UpdateLatestMSRT) { if ($UpdateLatestMSRT) {
WriteLog "`$UpdateLatestMSRT is set to true." WriteLog "`$UpdateLatestMSRT is set to true."
$Name = "Windows Malicious Software Removal Tool"
#Check if $MSRTPath exists, if not, create it #Check if $MSRTPath exists, if not, create it
if (-not (Test-Path -Path $MSRTPath)) { if (-not (Test-Path -Path $MSRTPath)) {
WriteLog "Creating $MSRTPath" WriteLog "Creating $MSRTPath"
New-Item -Path $MSRTPath -ItemType Directory -Force | Out-Null New-Item -Path $MSRTPath -ItemType Directory -Force | Out-Null
} }
WriteLog "Getting Windows Malicious Software Removal Tool URL" WriteLog "Getting Windows Malicious Software Removal Tool URL"
$MSRTUrl = Get-MSRTUrl -WindowsArch $WindowsArch $MSRTFileName = Save-KB -Name $Name -Path $MSRTPath
$MSRTFileName = Split-Path -Path $MSRTUrl -Leaf WriteLog "Latest Windows Malicious Software Removal Tool saved to $MSRTPath\$MSRTFileName"
try {
WriteLog "Windows Malicious Software Removal Tool URL for $WindowsArch is $MSRTUrl"
Start-BitsTransferWithRetry -Source $MSRTUrl -Destination "$MSRTPath\$MSRTFileName"
WriteLog "Windows Malicious Software Removal Tool downloaded to $MSRTPath\$MSRTFileName"
}
catch {
Write-Error "Downloading Windows Malicious Software Removal Tool failed"
WriteLog "Downloading Windows Malicious Software Removal Tool failed"
throw $_
}
WriteLog "Updating $AppsPath\InstallAppsandSysprep.cmd to include Windows Malicious Software Removal Tool" WriteLog "Updating $AppsPath\InstallAppsandSysprep.cmd to include Windows Malicious Software Removal Tool"
$CmdContent = Get-Content -Path "$AppsPath\InstallAppsandSysprep.cmd" $CmdContent = Get-Content -Path "$AppsPath\InstallAppsandSysprep.cmd"
$UpdatedcmdContent = $CmdContent -replace '^(REM Install Windows Malicious Software Removal Tool)', ("REM Install Windows Malicious Software Removal Tool`r`nd:\MSRT\$MSRTFileName /quiet") $UpdatedcmdContent = $CmdContent -replace '^(REM Install Windows Malicious Software Removal Tool)', ("REM Install Windows Malicious Software Removal Tool`r`nd:\MSRT\$MSRTFileName /quiet")