summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-07-03 00:08:05 +1000
committerGitHub <noreply@github.com>2022-07-02 15:08:05 +0100
commit25033d5d9ee1298c719d8e33a96eb7cabb9c04ac (patch)
tree75f2ca5feeb228188855b16d7e8f28952ee91d75
parent1cffe5b6ce764f4ff0d07e93669a425773ccc103 (diff)
MSYS2 install: use MinGW python-qmk package (#17302)
* MSYS2 install: use MinGW python-qmk package * Add missing flashers * Note VC Redist for manual install * VC Redist no longer needed
-rw-r--r--docs/newbs_getting_started.md10
-rwxr-xr-xutil/install/msys2.sh13
2 files changed, 7 insertions, 16 deletions
diff --git a/docs/newbs_getting_started.md b/docs/newbs_getting_started.md
index d5f92cf89d..55a50f7b3c 100644
--- a/docs/newbs_getting_started.md
+++ b/docs/newbs_getting_started.md
@@ -36,21 +36,15 @@ Alternatively, if you'd like to manually install MSYS2, the following section wi
#### Prerequisites
-You will need to install MSYS2, Git and Python. Follow the installation instructions on https://www.msys2.org.
-
-Once MSYS2 is installed, close any open MSYS terminals and open a new MinGW 64-bit terminal.
+You will need to install [MSYS2](https://www.msys2.org). Once installed, close any open MSYS terminals (purple icon) and open a new MinGW 64-bit terminal (blue icon) from the Start Menu.
!> **NOTE:** The MinGW 64-bit terminal is *not* the same as the MSYS terminal that opens when installation is completed. Your prompt should say "MINGW64" in purple text, rather than "MSYS". See [this page](https://www.msys2.org/wiki/MSYS2-introduction/#subsystems) for more information on the differences.
-Then run the following command:
-
- pacman --needed --noconfirm --disable-download-timeout -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python3-pip mingw-w64-x86_64-python-pillow
-
#### Installation
Install the QMK CLI by running:
- python3 -m pip install qmk
+ pacman --needed --noconfirm --disable-download-timeout -S git mingw-w64-x86_64-python-qmk
</details>
diff --git a/util/install/msys2.sh b/util/install/msys2.sh
index c57c455eb4..fa422023ab 100755
--- a/util/install/msys2.sh
+++ b/util/install/msys2.sh
@@ -7,17 +7,14 @@ _qmk_install_prepare() {
_qmk_install() {
echo "Installing dependencies"
- pacman --needed --noconfirm --disable-download-timeout -S pactoys-git
+ pacman --needed --noconfirm --disable-download-timeout -S pactoys
pacboy sync --needed --noconfirm --disable-download-timeout \
- base-devel: toolchain:x clang:x git: unzip: python3-pip:x \
- avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x \
- arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x \
- dfu-programmer:x dfu-util:x teensy-loader-cli:x hidapi:x \
- python-appdirs:x python-colorama:x python-jsonschema:x python-pillow:x python-pygments:x
+ base-devel: toolchain:x clang:x python-qmk:x hidapi:x \
+ avr-binutils:x avr-gcc:x avr-libc:x \
+ arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x \
+ avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x hid-bootloader-cli:x mdloader:x teensy-loader-cli:x wb32-dfu-updater:x
_qmk_install_drivers
-
- python3 -m pip install -r "$QMK_FIRMWARE_DIR/requirements.txt"
}
_qmk_install_drivers() {