Strip out more components that lead to running the wrong environment (#…

…45) * strip msys2_shell * Add msys2_shell replacement
qmk · Apr 17, 2021 · a92a96e · a92a96e
1 parent 11f5fb9
commit a92a96e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/src/shell_connector.cmd 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 %*