add -yq flags to actually make it noninteractive

[qmk_firmware.git] / util / linux_install.sh

diff --git a/util/linux_install.sh b/util/linux_install.sh
index 971d4c543c05d3fae63a1c8797580be64d98e1c9..608975a91587b262ea9c1165130fb7f975d06eae 100755 (executable)
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -32,9 +32,9 @@ if grep ID /etc/os-release | grep -qE "fedora"; then
 elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
        DEBIAN_FRONTEND=noninteractive
        DEBCONF_NONINTERACTIVE_SEEN=true
-        export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+       export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
        sudo apt-get update
-       sudo apt-get install \
+       sudo apt-get -yq install \
                build-essential \
                avr-libc \
                binutils-arm-none-eabi \
@@ -61,29 +61,27 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
                avr-binutils \
                avr-libc \
                avr-gcc \
-    base-devel \
+               base-devel \
                dfu-util \
-               diff-utils \
+               diffutils \
                gcc \
                git \
                unzip \
                wget \
                zip
        git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer
-       cd /tmp/dfu-programmer
+       cd /tmp/dfu-programmer || exit 1
        makepkg -sic
        rm -rf /tmp/dfu-programmer/
 
 elif grep ID /etc/os-release | grep -q gentoo; then
-       echo GENTOO_WARNING | fmt
-       echo -n "Proceed (y/N)? "
-       old_stty_cfg=$(stty -g)
-       stty raw -echo
-       answer=$( while ! head -c 1 | grep -i '[ny]' ;do true ;done )
-       stty $old_stty_cfg
-       if echo "$answer" | grep -iq "^y" ;then
+       echo "$GENTOO_WARNING" | fmt
+       printf "\nProceed (y/N)? "
+       read -r answer
+       if echo "$answer" | grep -iq "^y"; then
                sudo touch /etc/portage/package.use/qmkfirmware
-               echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware > /dev/null
+               # tee is used here since sudo doesn't apply to >>
+               echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
                sudo emerge -auN \
                        app-arch/unzip \
                        app-arch/zip \
@@ -112,12 +110,15 @@ elif grep ID /etc/os-release | grep -q sabayon; then
 
 elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then
        CROSS_AVR_GCC=cross-avr-gcc8
+       CROSS_ARM_GCC=cross-arm-none-gcc8
        if grep ID /etc/os-release | grep -q "15.0"; then
                CROSS_AVR_GCC=cross-avr-gcc7
+               CROSS_ARM_GCC=cross-arm-none-gcc7
        fi
        sudo zypper install \
                avr-libc \
                $CROSS_AVR_GCC \
+               $CROSS_ARM_GCC \
                cross-avr-binutils \
                cross-arm-none-newlib-devel \
                cross-arm-binutils cross-arm-none-newlib-devel \