From 5c8954036daad12ee52d23548d06fc4ba7c596ab Mon Sep 17 00:00:00 2001
From: doylet <doyle.github.2ifxi@simplelogin.com>
Date: Tue, 9 Apr 2024 21:17:10 +1000
Subject: [PATCH] Simplify MSYS2 scripts

---
 ...msys2-mingw64-gcc-x64-msvcrt-libstdc++.bat |  3 ---
 .../msys2-msys-gcc-x64-cygwin-libstdc++.bat   |  3 ---
 .../msys2-ucrt64-gcc-x64-ucrt-libstdc++.bat   |  3 ---
 Win/Scripts/msys2_env.bat                     | 27 +++++++++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 Win/Scripts/msys2-mingw64-gcc-x64-msvcrt-libstdc++.bat
 delete mode 100644 Win/Scripts/msys2-msys-gcc-x64-cygwin-libstdc++.bat
 delete mode 100644 Win/Scripts/msys2-ucrt64-gcc-x64-ucrt-libstdc++.bat
 create mode 100644 Win/Scripts/msys2_env.bat

diff --git a/Win/Scripts/msys2-mingw64-gcc-x64-msvcrt-libstdc++.bat b/Win/Scripts/msys2-mingw64-gcc-x64-msvcrt-libstdc++.bat
deleted file mode 100644
index 50cecd9..0000000
--- a/Win/Scripts/msys2-mingw64-gcc-x64-msvcrt-libstdc++.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-%devenver_root%\msys2\20240113\msys2_shell.cmd -defterm -here -use-full-path -no-start -mingw64 -shell bash
diff --git a/Win/Scripts/msys2-msys-gcc-x64-cygwin-libstdc++.bat b/Win/Scripts/msys2-msys-gcc-x64-cygwin-libstdc++.bat
deleted file mode 100644
index 599dd27..0000000
--- a/Win/Scripts/msys2-msys-gcc-x64-cygwin-libstdc++.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-%devenver_root%\msys2\20240113\msys2_shell.cmd -defterm -here -use-full-path -no-start -msys -shell bash
diff --git a/Win/Scripts/msys2-ucrt64-gcc-x64-ucrt-libstdc++.bat b/Win/Scripts/msys2-ucrt64-gcc-x64-ucrt-libstdc++.bat
deleted file mode 100644
index 51b52b2..0000000
--- a/Win/Scripts/msys2-ucrt64-gcc-x64-ucrt-libstdc++.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-%devenver_root%\msys2\20240113\msys2_shell.cmd -defterm -here -use-full-path -no-start -ucrt64 -shell bash
diff --git a/Win/Scripts/msys2_env.bat b/Win/Scripts/msys2_env.bat
new file mode 100644
index 0000000..f6bd88f
--- /dev/null
+++ b/Win/Scripts/msys2_env.bat
@@ -0,0 +1,27 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+if "%~1"=="help"   goto :help
+if "%~1"==""       goto :help
+if "%~1"=="--help" goto :help
+if "%~1"=="/?"     goto :help
+if "%~2"==""       goto :help
+goto :run
+
+:help
+echo USAGE: msys2_env.bat ^<environment^> ^<command^>
+echo.
+echo ENVIRONMENTS:
+echo   ^| Name      ^| Toolchain ^| Arch ^| C Runtime ^| C++ Runtime ^|
+echo   ^| 'clang64' ^| llvm      ^| x64  ^| ucrt      ^| libc++      ^|
+echo   ^| 'mingw32' ^| gcc       ^| x86  ^| msvcrt    ^| libstdc++   ^|
+echo   ^| 'mingw64' ^| gcc       ^| x64  ^| msvcrt    ^| libstdc++   ^|
+echo   ^| 'msys2'   ^| gcc       ^| x64  ^| cygwin    ^| libstdc++   ^|
+echo   ^| 'ucrt64'  ^| gcc       ^| x64  ^| ucrt      ^| libstdc++   ^|
+goto :eof
+
+:run
+set msys_env=%~1
+for /f "tokens=1,* delims= " %%a in ("%*") do set remaining_args=%%b
+
+%devenver_root%\MSYS2\20240113\msys2_shell.cmd -%msys_env% -no-start -defterm -here -c "%remaining_args%"