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

Fix x64 detection, Win7 PowerShell 3.0 prompt and other issues

Browse Source 
* .Contains() cannot be used with PowerShell 2.0 (Win7 default), which prevents
  the prompt that asks users to install PowerShell 3.0 from being displayed...
* Fix LTR display of Windows Releases for RTL languages.
* $env:PROCESSOR_ARCHITECTURE reports the architecture of the PowerShell runtime
  rather than the one from the OS, meaning that when executed in 32-bit mode on
  a 64-bit system (like with Rufus) it will report X86 instead of AMD64.
  Use [Environment]::Is64BitOperatingSystem instead.
* Closes #5
This commit is contained in:
Pete Batard
2019-03-16 23:30:58 +00:00
parent 5f246fc1c1
commit 775f80631e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Fido.ps1
View File

@@ -1,5 +1,5 @@
# #
# Fido v1.06 - Retail Windows ISO Downloader # Fido v1.07 - Retail Windows ISO Downloader
# Copyright © 2019 Pete Batard <pete@akeo.ie> # Copyright © 2019 Pete Batard <pete@akeo.ie>
# ConvertTo-ImageSource: Copyright © 2016 Chris Carter # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
# #
@@ -332,12 +332,12 @@ function ConvertTo-ImageSource
# Translate a message string # Translate a message string
function Get-Translation([string]$Text) function Get-Translation([string]$Text)
{ {
if (-not $English.Contains($Text)) { if (-not $English -contains $Text) {
Write-Host "Error: '$Text' is not a translatable string" Write-Host "Error: '$Text' is not a translatable string"
return "(Untranslated)" return "(Untranslated)"
} }
if ($Localized) { if ($Localized) {
if ($Localized.Length -ne $English.Length) { if ($Localized.Length -ne $English.Length) {
Write-Host "Error: '$Text' is not a translatable string" Write-Host "Error: '$Text' is not a translatable string"
} }
for ($i = 0; $i -lt $English.Length; $i++) { for ($i = 0; $i -lt $English.Length; $i++) {
@@ -407,6 +407,7 @@ function Get-RandomDate()
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"
$dh = 58; $dh = 58;
$Stage = 0 $Stage = 0
$ltrm = "‎"
$MaxStage = 4 $MaxStage = 4
$SessionId = [guid]::NewGuid() $SessionId = [guid]::NewGuid()
$ExitCode = 100 $ExitCode = 100
@@ -516,7 +517,8 @@ $Continue.add_click({
$array = @() $array = @()
foreach ($Version in $WindowsVersions[$WindowsVersion.SelectedValue.Index]) { foreach ($Version in $WindowsVersions[$WindowsVersion.SelectedValue.Index]) {
if (($i -ne 0) -and ($Version -is [array])) { if (($i -ne 0) -and ($Version -is [array])) {
$array += @(New-Object PsObject -Property @{ Release = $Version[0]; Index = $i }) Write-Host $Version[0]
$array += @(New-Object PsObject -Property @{ Release = $ltrm + $Version[0].Replace(")", ")" + $ltrm); Index = $i })
} }
$i++ $i++
} }
@@ -609,6 +611,7 @@ $Continue.add_click({
$SelectedIndex = 0 $SelectedIndex = 0
$array = @() $array = @()
try { try {
$Is64 = [Environment]::Is64BitOperatingSystem
$r = Invoke-WebRequest -UserAgent $UserAgent -WebSession $Session $url $r = Invoke-WebRequest -UserAgent $UserAgent -WebSession $Session $url
if (-not $($r.AllElements | ? {$_.id -eq "expiration-time"})) { if (-not $($r.AllElements | ? {$_.id -eq "expiration-time"})) {
$ErrorMessage = $(GetElementById -Request $r -Id "errorModalMessage").innerText $ErrorMessage = $(GetElementById -Request $r -Id "errorModalMessage").innerText
@@ -632,12 +635,12 @@ $Continue.add_click({
$Type = $json.DownloadType $Type = $json.DownloadType
if ($Type -eq "IsoX64") { if ($Type -eq "IsoX64") {
$Type = "x64" $Type = "x64"
if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64") { if ($Is64) {
$SelectedIndex = $i $SelectedIndex = $i
} }
} elseif ($Type -eq "IsoX86") { } elseif ($Type -eq "IsoX86") {
$Type = "x86" $Type = "x86"
if ($env:PROCESSOR_ARCHITECTURE -eq "X86") { if (-not $Is64) {
$SelectedIndex = $i $SelectedIndex = $i
} }
} }