From c38b8042bf8710c172f95f8c31b265ed8ea796ba Mon Sep 17 00:00:00 2001 From: gus33000 Date: Sun, 31 Jan 2016 20:07:51 +0100 Subject: [PATCH] fixes --- bin/main.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/main.ps1 b/bin/main.ps1 index 11de45c..496827e 100644 --- a/bin/main.ps1 +++ b/bin/main.ps1 @@ -727,6 +727,8 @@ function Convert-ESD ( ) { $Results = prepforconvert -ESDFiles $esdfiles -CryptoKey $CryptoKey + $filename = $Results[2] + $label = $Results[3] $result = $Results[0] [array]$esdinfos = $Results[1] if ($result -is [System.Array]) { @@ -1166,13 +1168,13 @@ function Convert-ESD ( Write-Host 'Generating ISO...' $BootData='2#p0,e,bMedia\boot\etfsboot.com#pEF,e,bMedia\efi\Microsoft\boot\efisys.bin' & "cmd" "/c" ".\bin\cdimage.exe" "-bootdata:$BootData" "-o" "-h" "-m" "-u2" "-udfver102" "-t$timestamp" "-l$($label)" ".\Media" """$($Destination)\$($isoname)""" - Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png" + Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png" Update-Window Ended Visibility "Visible" CleanTM($clean) Update-Window Window Close } } - Create-ISO -Items $items -Archs $archs -Clean $result[1] -extensiontype $extensiontype -isoname $Results[2] -label $Results[3] + Create-ISO -Items $items -Archs $archs -Clean $result[1] -extensiontype $extensiontype -isoname $filename -label $label } else { function SelectSingleESD($Global:var) { function LoadXamlFile($path) { @@ -1540,13 +1542,13 @@ function Convert-ESD ( Write-Host 'Generating ISO...' $BootData='2#p0,e,bMedia\boot\etfsboot.com#pEF,e,bMedia\efi\Microsoft\boot\efisys.bin' & "cmd" "/c" ".\bin\cdimage.exe" "-bootdata:$BootData" "-o" "-h" "-m" "-u2" "-udfver102" "-t$timestamp" "-l$($label)" ".\Media" """$($Destination)\$($isoname)""" - Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png" + Update-Window CreatingtheISOFile Source "$(Get-ScriptDirectory)\check.png" Update-Window Ended Visibility "Visible" CleanTM($clean) Update-Window Window Close } } - Convert-ISO -SetupESD $SetupESD -WinREESD $WinREESD -Clean $result[1] -extensiontype $extensiontype -isoname $Results[2] -label $Results[3] + Convert-ISO -SetupESD $SetupESD -WinREESD $WinREESD -Clean $result[1] -extensiontype $extensiontype -isoname $filename -label $label } } }