jlammi/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil synced 2026-02-05 15:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add revamped detection for ISO creation

Browse Source
This commit is contained in:
CodingWonders
2025-12-24 16:09:58 +01:00
parent 49cbe45863
commit 71865a8957
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
functions/microwin/Invoke-Microwin.ps1
View File

@@ -521,12 +521,27 @@ public class PowerManagement {
Write-Host "Creating ISO image" Write-Host "Creating ISO image"
$adkKitsRoot = Microwin-GetKitsRoot -wow64environment $false
$adkKitsRoot_WOW64Environ = Microwin-GetKitsRoot -wow64environment $true
$expectedADKPath = "$($adkKitsRoot)Assessment and Deployment Kit"
$expectedADKPath_WOW64Environ = "$($adkKitsRoot_WOW64Environ)Assessment and Deployment Kit"
# if we downloaded oscdimg from github it will be in the temp directory so use it # if we downloaded oscdimg from github it will be in the temp directory so use it
# if it is not in temp it is part of ADK and is in global PATH so just set it to oscdimg.exe # if it is not in temp it is part of ADK and is in global PATH so just set it to oscdimg.exe
$oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe' $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
$oscdImgFound = Test-Path $oscdimgPath -PathType Leaf $oscdImgFound = Test-Path -Path "$oscdimgPath" -PathType Leaf
if (!$oscdImgFound) { if ((-not ($oscdImgFound)) -and ((Microwin-TestKitsRootPaths -adkKitsRootPath "$expectedADKPath" -adkKitsRootPath_WOW64Environ "$expectedADKPath_WOW64Environ") -eq $true)) {
$oscdimgPath = "oscdimg.exe" if ($expectedADKPath -ne "Assessment and Deployment Kit") { $peToolsPath = $expectedADKPath }
if (($peToolsPath -eq "") -and ($expectedADKPath_WOW64Environ -ne "Assessment and Deployment Kit")) { $peToolsPath = $expectedADKPath_WOW64Environ }
Write-Host "Using $peToolsPath as the Preinstallation Environment tools path..."
# Paths change depending on platform
if ([Environment]::Is64BitOperatingSystem) {
$oscdimgPath = "$peToolsPath\Deployment Tools\amd64\Oscdimg\oscdimg.exe"
} else {
$oscdimgPath = "$peToolsPath\Deployment Tools\x86\Oscdimg\oscdimg.exe"
}
} }
Write-Host "[INFO] Using oscdimg.exe from: $oscdimgPath" Write-Host "[INFO] Using oscdimg.exe from: $oscdimgPath"