elie/Fido
1
0
Fork 0
mirror of https://github.com/pbatard/Fido.git synced 2025-09-16 14:18:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Windows 10 20H1 19041.264 builds

Browse Source 
* Also enable going back on error
This commit is contained in:
Pete Batard
2020-05-27 22:13:51 +01:00
parent 445ca5c074
commit 46c399ecd7
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Fido.ps1
View File

@@ -1,6 +1,6 @@
# #
# Fido v1.15 - Retail Windows ISO Downloader # Fido v1.16 - Retail Windows ISO Downloader
# Copyright © 2019 Pete Batard <pete@akeo.ie> # Copyright © 2019-2020 Pete Batard <pete@akeo.ie>
# ConvertTo-ImageSource: Copyright © 2016 Chris Carter # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@@ -75,6 +75,12 @@ $ko = 0x20000
$WindowsVersions = @( $WindowsVersions = @(
@( @(
@("Windows 10", "Windows10ISO"), @("Windows 10", "Windows10ISO"),
@(
"20H1 (Build 19041.264 - 2020.05)",
@("Windows 10 Home/Pro", 1626),
@("Windows 10 Education", 1625),
@("Windows 10 Home China ", ($zh + 1627))
),
@( @(
"19H2 (Build 18363.418 - 2019.11)", "19H2 (Build 18363.418 - 2019.11)",
@("Windows 10 Home/Pro", 1429), @("Windows 10 Home/Pro", 1429),
@@ -210,7 +216,7 @@ function Select-Language([string]$LangName)
($SysLocale.StartsWith("da") -and $LangName -like "*Danish*") -or ` ($SysLocale.StartsWith("da") -and $LangName -like "*Danish*") -or `
($SysLocale.StartsWith("nl") -and $LangName -like "*Dutch*") -or ` ($SysLocale.StartsWith("nl") -and $LangName -like "*Dutch*") -or `
($SysLocale -eq "en-US" -and $LangName -eq "English") -or ` ($SysLocale -eq "en-US" -and $LangName -eq "English") -or `
($SysLocale.StartsWith("en") -and $LangName -like "*English*" -and $LangName -like "*inter*") -or ` ($SysLocale.StartsWith("en") -and $LangName -like "*English*" -and ($LangName -like "*inter*" -or $LangName -like "*ingdom*")) -or `
($SysLocale.StartsWith("et") -and $LangName -like "*Eston*") -or ` ($SysLocale.StartsWith("et") -and $LangName -like "*Eston*") -or `
($SysLocale.StartsWith("fi") -and $LangName -like "*Finn*") -or ` ($SysLocale.StartsWith("fi") -and $LangName -like "*Finn*") -or `
($SysLocale -eq "fr-CA" -and $LangName -like "*French*" -and $LangName -like "*Canad*") -or ` ($SysLocale -eq "fr-CA" -and $LangName -like "*French*" -and $LangName -like "*Canad*") -or `
@@ -385,12 +391,9 @@ function Error([string]$ErrorMessage)
Write-Host Error: $ErrorMessage Write-Host Error: $ErrorMessage
$XMLForm.Title = $(Get-Translation("Error")) + ": " + $ErrorMessage $XMLForm.Title = $(Get-Translation("Error")) + ": " + $ErrorMessage
Refresh-Control($XMLForm) Refresh-Control($XMLForm)
$Continue.Content = Get-Translation("Close") $XMLGrid.Children[2 * $script:Stage + 1].IsEnabled = $True
Refresh-Control($Continue)
$UserInput = [System.Windows.MessageBox]::Show($XMLForm.Title, $(Get-Translation("Error")), "OK", "Error") $UserInput = [System.Windows.MessageBox]::Show($XMLForm.Title, $(Get-Translation("Error")), "OK", "Error")
$script:ExitCode = $Stage $script:ExitCode = $script:Stage--
$script:Stage = -1
$Continue.IsEnabled = $True
} }
function Get-RandomDate() function Get-RandomDate()
@@ -508,11 +511,7 @@ $WindowsVersion.DisplayMemberPath = "Version"
# Button Action # Button Action
$Continue.add_click({ $Continue.add_click({
if ($script:Stage++ -lt 0) { $script:Stage++
Get-Process -Id $pid | Foreach-Object { $_.CloseMainWindow() | Out-Null }
return
}
$XMLGrid.Children[2 * $Stage + 1].IsEnabled = $False $XMLGrid.Children[2 * $Stage + 1].IsEnabled = $False
$Continue.IsEnabled = $False $Continue.IsEnabled = $False
$Back.IsEnabled = $False $Back.IsEnabled = $False
@@ -602,7 +601,7 @@ $Continue.add_click({
} }
} catch { } catch {
Error($_.Exception.Message) Error($_.Exception.Message)
return break
} }
$script:Language = Add-Entry $Stage "Language" $array "DisplayLanguage" $script:Language = Add-Entry $Stage "Language" $array "DisplayLanguage"
$Language.SelectedIndex = $SelectedIndex $Language.SelectedIndex = $SelectedIndex
@@ -657,7 +656,7 @@ $Continue.add_click({
} }
} catch { } catch {
Error($_.Exception.Message) Error($_.Exception.Message)
return break
} }
$script:Arch = Add-Entry $Stage "Architecture" $array "Type" $script:Arch = Add-Entry $Stage "Architecture" $array "Type"
@@ -694,7 +693,7 @@ $Continue.add_click({
} }
$Continue.IsEnabled = $True $Continue.IsEnabled = $True
if ($Stage -ge 0) { if ($Stage -ge 0) {
$Back.IsEnabled = $True; $Back.IsEnabled = $True
} }
}) })
@@ -718,10 +717,12 @@ $Back.add_click({
$Margin.Top -= $dh2 $Margin.Top -= $dh2
$Back.Margin = $Margin $Back.Margin = $Margin
$script:Stage = $Stage - 1 $script:Stage = $Stage - 1
$XMLForm.Title = $AppTitle
if ($Stage -eq 0) { if ($Stage -eq 0) {
$Back.Content = Get-Translation("Close") $Back.Content = Get-Translation("Close")
} elseif ($Stage -eq 3) { } else {
$Continue.Content = Get-Translation("Continue") $Continue.Content = Get-Translation("Continue")
Refresh-Control($Continue)
} }
} }
}) })