From a12a3b7042abead3e4145bd78a6f61dc4951fcf6 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Tue, 19 May 2020 13:16:59 +0300
Subject: [PATCH] Rename Mingw-w64 (#893)

---
 images/win/Windows2016-Azure.json                  |  4 ++--
 images/win/Windows2019-Azure.json                  |  4 ++--
 .../{Install-MinGW.ps1 => Install-Mingw64.ps1}     |  2 +-
 .../{Validate-MinGW.ps1 => Validate-Mingw64.ps1}   | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename images/win/scripts/Installers/{Install-MinGW.ps1 => Install-Mingw64.ps1} (94%)
 rename images/win/scripts/Installers/{Validate-MinGW.ps1 => Validate-Mingw64.ps1} (81%)

diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 945e7974..795ebd4b 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -547,7 +547,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1"
             ]
         },
         {
@@ -861,7 +861,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1"
+                "{{ template_dir }}/scripts/Installers/Validate-Mingw64.ps1"
             ]
         },
         {
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index aa008e02..9cebffb4 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -526,7 +526,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1"
             ]
         },
         {
@@ -846,7 +846,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1"
+                "{{ template_dir }}/scripts/Installers/Validate-Mingw64.ps1"
             ]
         },
         {
diff --git a/images/win/scripts/Installers/Install-MinGW.ps1 b/images/win/scripts/Installers/Install-Mingw64.ps1
similarity index 94%
rename from images/win/scripts/Installers/Install-MinGW.ps1
rename to images/win/scripts/Installers/Install-Mingw64.ps1
index ac585b9d..fcb8f781 100644
--- a/images/win/scripts/Installers/Install-MinGW.ps1
+++ b/images/win/scripts/Installers/Install-Mingw64.ps1
@@ -1,5 +1,5 @@
 ################################################################################
-##  File:  Install-MinGW.ps1
+##  File:  Install-Mingw64.ps1
 ##  Desc:  Install GNU tools for Windows to C:\tools\mingw64
 ################################################################################
 
diff --git a/images/win/scripts/Installers/Validate-MinGW.ps1 b/images/win/scripts/Installers/Validate-Mingw64.ps1
similarity index 81%
rename from images/win/scripts/Installers/Validate-MinGW.ps1
rename to images/win/scripts/Installers/Validate-Mingw64.ps1
index 475372cd..080a9797 100644
--- a/images/win/scripts/Installers/Validate-MinGW.ps1
+++ b/images/win/scripts/Installers/Validate-Mingw64.ps1
@@ -1,6 +1,6 @@
 ################################################################################
-##  File:  Validate-MinGW.ps1
-##  Desc:  Validate MinGW
+##  File:  Validate-Mingw64.ps1
+##  Desc:  Validate Mingw64
 ################################################################################
 
 if (Get-Command -Name 'gcc')
@@ -39,19 +39,19 @@ else
 # Adding description of the software to Markdown
 
 # `gcc --version` gives output like:
-# gcc.exe (x86_64-posix-seh-rev0, Built by MinGW-W64 project) 5.3.0
+# gcc.exe (x86_64-posix-seh-rev0, Built by Mingw-w64 project) 5.3.0
 # Copyright (C) 2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-$SoftwareName = "MinGW"
+$SoftwareName = "Mingw-w64"
 $(gcc --version).Split([System.Environment]::NewLine)[0] -match "\d\.\d\.\d$"
-$minGwVersion = $matches[0]
+$mingw64Version = $matches[0]
 
 $Description = @"
-_Version:_ $minGwVersion<br/>
+_Version:_ $mingw64Version<br/>
 _Environment:_
-* PATH: contains location of the MinGW 'bin' directory
+* PATH: contains location of the Mingw-w64 'bin' directory
 "@
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description