Fix Windows 7 detection

* Of course, Windows 7's PowerShell is too stupid to actually compare Version objects.

.gitattributes

@@ -1,3 +1,6 @@
 * text=auto
 *.ps1  eol=crlf
 *.sh   eol=lf
+.gitattributes export-ignore
+.gitignore     export-ignore
+sign.sh        export-ignore

.whitesource

@@ -1,8 +0,0 @@
-{
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure"
-  },
-  "issueSettings": {
-    "minSeverityLevel": "LOW"
-  }
-}

Fido.pssproj

@@ -1,35 +0,0 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>6CAFC0C6-A428-4d30-A9F9-700E829FEA51</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Fido</RootNamespace>
-    <AssemblyName>Fido</AssemblyName>
-    <Name>Frida</Name>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Compile Include="Fido.ps1" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="Build" />
-  <Import Project="$(MSBuildExtensionsPath)\PowerShell Tools for Visual Studio\PowerShellTools.targets" Condition="Exists('$(MSBuildExtensionsPath)\PowerShell Tools for Visual Studio\PowerShellTools.targets')" />
-</Project>

Fido.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Fido", "Fido.pssproj", "{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AD54CEAE-0992-4213-BEDB-8F1CF98A9F22}
-	EndGlobalSection
-EndGlobal

README.md

@@ -1,5 +1,5 @@
-Fido: Full ISO Download Script (for Windows retail ISOs)
+Fido: A PowerShell download script for Microsoft Windows and UEFI Shell ISOs
-========================================================
+============================================================================
 
 [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 [![Github stats](https://img.shields.io/github/downloads/pbatard/Fido/total.svg?style=flat-square)](https://github.com/pbatard/Fido/releases)
@@ -9,12 +9,12 @@ Description
 
 Fido is a PowerShell script that is primarily designed to be used in [Rufus](https://github.com/pbatard/rufus), but that
 can also be used in standalone fashion, and whose purpose is to automate access to the official Microsoft Windows retail
-ISO download links.
+ISO download links as well as provide convenient access to [bootable UEFI Shell images](https://github.com/pbatard/UEFI-Shell).
 
 This script exists because, while Microsoft does make retail ISO download links freely and publicly available (at least
-for Windows 8 and Windows 10), it only does so after actively forcing users to jump through a lot of unwarranted hoops,
+for Windows 8 through Windows 11), up until recent releases, most of these links were only available after forcing users
-that create an exceedingly counterproductive, if not downright unfriendly, consumer experience and that greatly detract
+to jump through a lot of unwarranted hoops that created an exceedingly counterproductive, if not downright unfriendly,
-from what people really want (direct access to ISO downloads).
+consumer experience, that greatly detracted from what people really want (direct access to ISO downloads).
 
 As to the reason one might want to download Windows __retail__ ISOs, as opposed to the ISOs that are generated by
 Microsoft's own Media Creation Tool (MCT), this is because using official retail ISOs is currently the only way to
@@ -42,18 +42,16 @@ License
 How it works
 ------------
 
-The script basically performs the same operation as one might perform when visiting either of the following URLs (that
+The script basically performs the same operation as one might perform when visiting the following URL (that is, in the
-is, provided that you have also changed your `User-Agent` browser string, since, when they detect that you are using a
+case of Windows 10, provided that you have also changed your `User-Agent` browser string, since, the Microsoft web
-version of Windows that is the same as the one you are trying to download, the Microsoft web servers at these addresses
+servers detect that you are using a version of Windows that is the same as the one you are trying to download, they
-redirect you __away__ from the pages that allow you to download retail ISOs):
+may redirect you __away__ from the page that allows you to obtain a direct ISO download link):
 
-* https://www.microsoft.com/software-download/Windows8ISO
+https://www.microsoft.com/en-us/software-download
-* https://www.microsoft.com/software-download/Windows10ISO
 
-After visiting those with a full browser (Internet Explorer, running through the `Invoke-WebRequest` PowerShell Cmdlet),
+After checking basic access to the Microsoft software downloads website the script first queries the web API from the
-to confirm that they are accessible, the script then queries the web API from the Microsoft servers to first request the
+Microsoft servers, to request the language selection available for the version of Windows selected, and then requests
-language selection available for the version of Windows selected by the user, and then request the actual download links
+the actual download links, for all the architectures available for that language + version.
-for all the architectures available for that specific combination of version + language.
 
 Requirements
 ------------
@@ -65,6 +63,65 @@ of Windows 7).
 Note that the current version of the script does not need Internet Explorer to be installed and should also work with
 PowerShell 7.
 
+Commandline mode
+----------------
+
+Fido supports commandline mode whereas, whenever one of the following options is provided, a GUI is not instantiated
+and you can instead generate the ISO download from within a PowerShell console or script.
+
+The options are:
+- `Win`: Specify Windows version (e.g. _"Windows 10"_). Abbreviated version should work as well (e.g `-Win 10`) as long
+   as it is unique enough. If this option isn't specified, the most recent version of Windows is automatically selected.  
+   You can obtain a list of supported versions by specifying `-Win List`.
+- `Rel`: Specify Windows release (e.g. _"21H1"_). If this option isn't specified, the most recent release for the chosen
+   version of Windows is automatically selected. You can also use `-Rel Latest` to force the most recent to be used.
+   You can obtain a list of supported versions by specifying `-Rel List`.
+- `Ed`: Specify Windows edition (e.g. _"Pro/Home"_). Abbreviated editions should work as well (e.g `-Ed Pro`) as long
+   as it is unique enough. If this option isn't specified, the most recent version of Windows is automatically selected.  
+   You can obtain a list of supported versions by specifying `-Ed List`.
+- `Lang`: Specify Windows language (e.g. _"Arabic"_). Abbreviated or part of a language (e.g. `-Lang Int` for
+   `English International`) should work as long as it's unique enough. If this option isn't specified, the script attempts
+   to select the same language as the system locale.  
+   You can obtain a list of supported languages by specifying `-Lang List`.
+- `Arch`: Specify Windows architecture (e.g. _"x64"_). If this option isn't specified, the script attempts to use the same
+   architecture as the one from the current system.
+- `GetUrl`: By default, the script attempts to automatically launch the download. But when using the `-GetUrl` switch,
+   the script only displays the download URL, which can then be piped into another command or into a file.
+- `DisableProgress`: Disable progress report. This may speed up downloads when using the command line.
+
+Examples of a commandline download:
+
+```
+PS C:\Projects\Fido> .\Fido.ps1 -Win 10
+No release specified (-Rel). Defaulting to '21H1 (Build 19043.985 - 2021.05)'.
+No edition specified (-Ed). Defaulting to 'Windows 10 Home/Pro'.
+No language specified (-Lang). Defaulting to 'English International'.
+No architecture specified (-Arch). Defaulting to 'x64'.
+Selected: Windows 10 21H1 (Build 19043.985 - 2021.05), Home/Pro, English International, x64
+Downloading 'Win10_21H1_EnglishInternational_x64.iso' (5.0 GB)...
+PS C:\Projects\Fido> .\Fido.ps1 -Win 10 -Rel List
+Please select a Windows Release (-Rel) for Windows 10 (or use 'Latest' for most recent):
+ - 21H1 (Build 19043.985 - 2021.05)
+ - 20H2 (Build 19042.631 - 2020.12)
+ - 20H2 (Build 19042.508 - 2020.10)
+ - 20H1 (Build 19041.264 - 2020.05)
+ - 19H2 (Build 18363.418 - 2019.11)
+ - 19H1 (Build 18362.356 - 2019.09)
+ - 19H1 (Build 18362.30 - 2019.05)
+ - 1809 R2 (Build 17763.107 - 2018.10)
+ - 1809 R1 (Build 17763.1 - 2018.09)
+ - 1803 (Build 17134.1 - 2018.04)
+ - 1709 (Build 16299.15 - 2017.09)
+ - 1703 [Redstone 2] (Build 15063.0 - 2017.03)
+ - 1607 [Redstone 1] (Build 14393.0 - 2016.07)
+ - 1511 R3 [Threshold 2] (Build 10586.164 - 2016.04)
+ - 1511 R2 [Threshold 2] (Build 10586.104 - 2016.02)
+ - 1511 R1 [Threshold 2] (Build 10586.0 - 2015.11)
+ - 1507 [Threshold 1] (Build 10240.16384 - 2015.07)
+PS C:\Projects\Fido> .\Fido.ps1 -Win 10 -Rel 20H2 -Ed Edu -Lang Fre -Arch x86 -GetUrl
+https://software-download.microsoft.com/db/Win10_Edu_20H2_v2_French_x32.iso?t=c48b32d3-4cf3-46f3-a8ad-6dd9568ff4eb&e=1629113408&h=659cdd60399584c5dc1d267957924fbd
+```
+
 Additional Notes
 ----------------
 

sign.sh

@@ -21,7 +21,7 @@ sign_file() {
 }
 
 # Update the Authenticode signature
-cmd.exe /c '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp Fido.ps1'
+MSYS2_ARG_CONV_EXCL='*' "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 3dbc3a2a0e9ce8803b422cfdbc60acd33164965d /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 Fido.ps1
 read -s -p "Enter pass phrase for `realpath $PRIVATE_KEY`: " PASSWORD
 echo
 # Confirm that the pass phrase is valid by trying to sign a dummy file