Merge remote-tracking branch 'origin/master' into develop

Resolved Conflicts: lib/python/qmk/tests/test_cli_commands.py util/install/fedora.sh
2021-05-19 15:49:11 -07:00
parent 82aa9ad4a5 db1eacdaac
commit 6955c5a002
22 changed files with 70 additions and 78 deletions
--- a/util/install/msys2.sh
+++ b/util/install/msys2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

 _qmk_install_prepare() {
-    pacman -Syu
+    pacman -Syu $MSYS2_CONFIRM
 }

 _qmk_install() {