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

Resolved Conflicts:
	lib/python/qmk/tests/test_cli_commands.py
	util/install/fedora.sh

6 files changed, 12 insertions, 5 deletions

diff --git a/util/install/debian.sh b/util/install/debian.sh
index ef87c41b5..380348237 100755
--- a/util/install/debian.sh
+++ b/util/install/debian.sh
@@ -5,7 +5,7 @@ DEBCONF_NONINTERACTIVE_SEEN=true
 export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
 
 _qmk_install_prepare() {
-    sudo apt-get update
+    sudo apt-get update $SKIP_PROMPT
 }
 
 _qmk_install() {
diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 10fc7c8ad..3f9695356 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -4,7 +4,7 @@ _qmk_install() {
     echo "Installing dependencies"
 
     # TODO: Check whether devel/headers packages are really needed
-    sudo dnf -y install \
+    sudo dnf $SKIP_PROMPT install \
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
         make unzip wget zip python3 avr-binutils avr-gcc avr-libc \
         arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
diff --git a/util/install/freebsd.sh b/util/install/freebsd.sh
index 353c52d64..d9399a5de 100755
--- a/util/install/freebsd.sh
+++ b/util/install/freebsd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 _qmk_install_prepare() {
-    sudo pkg update
+    sudo pkg update $SKIP_PROMPT
 }
 
 _qmk_install() {
diff --git a/util/install/msys2.sh b/util/install/msys2.sh
index 9b8343aed..b027ff53d 100755
--- 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() {
diff --git a/util/install/void.sh b/util/install/void.sh
index 9ec7019e5..c49c3ef63 100755
--- a/util/install/void.sh
+++ b/util/install/void.sh
@@ -3,7 +3,7 @@
 _qmk_install() {
     echo "Installing dependencies"
 
-    sudo xbps-install \
+    sudo xbps-install $SKIP_PROMPT \
         gcc git make wget unzip zip \
         python3-pip \
         avr-binutils avr-gcc avr-libc \
diff --git a/util/qmk_install.sh b/util/qmk_install.sh
index 421a91a99..943069453 100755
--- a/util/qmk_install.sh
+++ b/util/qmk_install.sh
@@ -2,6 +2,13 @@
 
 QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." && pwd -P)
 QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util
+if [ "$1" = "-y" ]; then
+    SKIP_PROMPT='-y'
+    MSYS2_CONFIRM='--noconfirm'
+else
+    SKIP_PROMPT=''
+    MSYS2_CONFIRM=''
+fi
 
 case $(uname -a) in
     *Darwin*)