Skip to content
This repository was archived by the owner on Dec 10, 2018. It is now read-only.

Commit c38b804

Browse files
committed
fixes
1 parent 53266fc commit c38b804

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

bin/main.ps1

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,8 @@ function Convert-ESD (
727727
)
728728
{
729729
$Results = prepforconvert -ESDFiles $esdfiles -CryptoKey $CryptoKey
730+
$filename = $Results[2]
731+
$label = $Results[3]
730732
$result = $Results[0]
731733
[array]$esdinfos = $Results[1]
732734
if ($result -is [System.Array]) {
@@ -1166,13 +1168,13 @@ function Convert-ESD (
11661168
Write-Host 'Generating ISO...'
11671169
$BootData='2#p0,e,bMedia\boot\etfsboot.com#pEF,e,bMedia\efi\Microsoft\boot\efisys.bin'
11681170
& "cmd" "/c" ".\bin\cdimage.exe" "-bootdata:$BootData" "-o" "-h" "-m" "-u2" "-udfver102" "-t$timestamp" "-l$($label)" ".\Media" """$($Destination)\$($isoname)"""
1169-
Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png"
1171+
Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png"
11701172
Update-Window Ended Visibility "Visible"
11711173
CleanTM($clean)
11721174
Update-Window Window Close
11731175
}
11741176
}
1175-
Create-ISO -Items $items -Archs $archs -Clean $result[1] -extensiontype $extensiontype -isoname $Results[2] -label $Results[3]
1177+
Create-ISO -Items $items -Archs $archs -Clean $result[1] -extensiontype $extensiontype -isoname $filename -label $label
11761178
} else {
11771179
function SelectSingleESD($Global:var) {
11781180
function LoadXamlFile($path) {
@@ -1540,13 +1542,13 @@ function Convert-ESD (
15401542
Write-Host 'Generating ISO...'
15411543
$BootData='2#p0,e,bMedia\boot\etfsboot.com#pEF,e,bMedia\efi\Microsoft\boot\efisys.bin'
15421544
& "cmd" "/c" ".\bin\cdimage.exe" "-bootdata:$BootData" "-o" "-h" "-m" "-u2" "-udfver102" "-t$timestamp" "-l$($label)" ".\Media" """$($Destination)\$($isoname)"""
1543-
Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png"
1545+
Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png"
15441546
Update-Window Ended Visibility "Visible"
15451547
CleanTM($clean)
15461548
Update-Window Window Close
15471549
}
15481550
}
1549-
Convert-ISO -SetupESD $SetupESD -WinREESD $WinREESD -Clean $result[1] -extensiontype $extensiontype -isoname $Results[2] -label $Results[3]
1551+
Convert-ISO -SetupESD $SetupESD -WinREESD $WinREESD -Clean $result[1] -extensiontype $extensiontype -isoname $filename -label $label
15501552
}
15511553
}
15521554
}

0 commit comments

Comments
 (0)