From a92a96e03163f7b57375a04fc3164754cbefe079 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 17 Apr 2021 21:30:55 +0100
Subject: [PATCH] Strip out more components that lead to running the wrong
 environment (#45)

* strip msys2_shell

* Add msys2_shell replacement
---
 .github/workflows/build.yml | 1 +
 docs/faq.md                 | 2 +-
 installer/install.iss       | 1 +
 src/QMK_MSYS.bat            | 2 --
 src/shell_connector.cmd     | 6 ++++++
 5 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 src/QMK_MSYS.bat
 create mode 100644 src/shell_connector.cmd

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6cd76a9..c04f218 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,6 +61,7 @@ jobs:
         rm -rf .build/msys64/var/cache/pacman/pkg/*
         rm -f .build/msys64/*.exe
         rm -f .build/msys64/*.ico
+        rm -f .build/msys64/msys2_shell.cmd
         mkdir -p .build/msys64/dev/shm
         mkdir -p .build/msys64/dev/mqueue
         cp -rf src/* .build/msys64/
diff --git a/docs/faq.md b/docs/faq.md
index aca6112..e66ef2c 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -48,7 +48,7 @@ Note that the example below assumes that you have QMK MSYS installed to the defa
     {
       "guid": "{1ca2e875-5a87-40f8-b55c-e7ec84354a92}",
       "name": "QMK MSYS",
-      "commandline": "%SystemDrive%/QMK_MSYS/msys2_shell.cmd -defterm -no-start -mingw64",
+      "commandline": "%SystemDrive%/QMK_MSYS/shell_connector.cmd",
       "icon": "%SystemDrive%/QMK_MSYS/icon.ico"
     }
 ```
diff --git a/installer/install.iss b/installer/install.iss
index c09d0f0..7e04906 100644
--- a/installer/install.iss
+++ b/installer/install.iss
@@ -51,6 +51,7 @@ Name:"{app}\"; Permissions:everyone-modify
 Filename: "{tmp}\qmk_driver_installer.exe"; WorkingDir: "{tmp}"; Parameters: " --all --force drivers.txt"; StatusMsg: "Installing Drivers..."; Tasks: installdrivers; Flags: runhidden
 
 [Icons]
+Name: "{app}\{#MyAppName}"; Filename: "{app}\conemu\ConEmu64.exe"; Parameters: "-NoSingle -NoUpdate -icon {app}\icon.ico -title ""{#MyAppName}"" -run {app}\usr\bin\bash.exe -l -i -cur_console:m:"""""; IconFilename: "{app}\icon.ico"
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\conemu\ConEmu64.exe"; Parameters: "-NoSingle -NoUpdate -icon {app}\icon.ico -title ""{#MyAppName}"" -run {app}\usr\bin\bash.exe -l -i -cur_console:m:"""""; IconFilename: "{app}\icon.ico"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\conemu\ConEmu64.exe"; Parameters: "-NoSingle -NoUpdate -icon {app}\icon.ico -title ""{#MyAppName}"" -run {app}\usr\bin\bash.exe -l -i -cur_console:m:"""""; IconFilename: "{app}\icon.ico"; Tasks: desktopicon
 
diff --git a/src/QMK_MSYS.bat b/src/QMK_MSYS.bat
deleted file mode 100644
index 32d7dfc..0000000
--- a/src/QMK_MSYS.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-START "" "%~dp0conemu\ConEmu64.exe" -NoSingle -NoUpdate -icon %~dp0icon.ico -title "QMK MSYS" -run %~dp0usr\bin\bash.exe -l -i -cur_console:m:""
\ No newline at end of file
diff --git a/src/shell_connector.cmd b/src/shell_connector.cmd
new file mode 100644
index 0000000..1e7294e
--- /dev/null
+++ b/src/shell_connector.cmd
@@ -0,0 +1,6 @@
+@echo off
+
+set MSYSTEM=MINGW64
+set MSYS2_PATH_TYPE=inherit
+
+%~dp0\usr\bin\bash.exe -l -i %*