From db1eacdaacb9c8f6889f46bc1c6af155b81ad72a Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Wed, 19 May 2021 15:24:46 -0700
Subject: Align our subprocess usage with current best practices. (#12940)

* Align our subprocess usage with current best practices.

* remove unused import

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* fix the cpp invocation for older python

* allow for unprompted installation

* make sure qmk new-keyboard works on windows

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 util/install/debian.sh  | 2 +-
 util/install/fedora.sh  | 2 +-
 util/install/freebsd.sh | 2 +-
 util/install/msys2.sh   | 2 +-
 util/install/void.sh    | 2 +-
 util/qmk_install.sh     | 7 +++++++
 6 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'util')

diff --git a/util/install/debian.sh b/util/install/debian.sh
index 0ae9764a33..885df723d9 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 44b71b98bf..d9452f68d5 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 \
diff --git a/util/install/freebsd.sh b/util/install/freebsd.sh
index 353c52d647..d9399a5de9 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 c8598a60fa..b1300a34d2 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 9ec7019e5c..c49c3ef63f 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 421a91a999..943069453a 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*)
-- 
cgit v1.2.3