1 files changed, 88 insertions, 28 deletions

diff --git a/util/linux_install.sh b/util/linux_install.sh
index 0e4e26fd9..a6a053276 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -1,40 +1,100 @@
 #!/bin/sh
-if grep ID /etc/os-release | grep -qE "rhel|fedora"; then
-        # RPM based OS
-        sudo dnf install gcc unzip wget zip dfu-util dfu-programmer avr-gcc \
-            avr-libc binutils-avr32-linux-gnu arm-none-eabi-gcc-cs \
-            arm-none-eabi-binutils-cs arm-none-eabi-newlib
+
+# Note: This file uses tabs to indent. Please don't mix tabs and spaces.
+
+GENTOO_WARNING="This script will make a USE change in order to ensure that that QMK works on your system. All changes will be sent to the the file /etc/portage/package.use/qmk_firmware -- please review it, and read Portage's output carefully before installing any packages on your system. You will also need to ensure that your kernel is compiled with support for the keyboard chip that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki."
+
+if grep ID /etc/os-release | grep -qE "fedora"; then
+        sudo dnf install \
+                arm-none-eabi-binutils-cs \
+                arm-none-eabi-gcc-cs \
+                arm-none-eabi-newlib
+                avr-binutils \
+                avr-gcc \
+                avr-libc \
+                binutils-avr32-linux-gnu \
+                dfu-util \
+                dfu-programmer \
+                diffutils \
+                git \
+                gcc \
+                glibc-headers \
+                kernel-devel \
+                kernel-headers \
+                make \
+                perl \
+                unzip \
+                wget \
+                zip
+
 elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
+        DEBIAN_FRONTEND=noninteractive
+        DEBCONF_NONINTERACTIVE_SEEN=true
+        export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
         sudo apt-get update
-        sudo apt-get install gcc unzip wget zip gcc-avr binutils-avr avr-libc \
-            dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi \
-            libnewlib-arm-none-eabi
+        sudo apt-get install \
+                build-essential \
+                avr-libc \
+                binutils-arm-none-eabi \
+                binutils-avr \
+                dfu-programmer \
+                dfu-util \
+                diffutils \
+                gcc \
+                gcc-arm-none-eabi \
+                gcc-avr \
+                git \
+                libnewlib-arm-none-eabi \
+                unzip \
+                wget \
+                zip
+
 elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
-  # install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug.
-  sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz
-        sudo pacman -S gcc unzip wget zip avr-binutils avr-libc \
-            dfu-util arm-none-eabi-gcc arm-none-eabi-binutils \
-            arm-none-eabi-newlib
+        # install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug.
+        sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz
+        sudo pacman -S \
+                arm-none-eabi-binutils \
+                arm-none-eabi-gcc \
+                arm-none-eabi-newlib \
+                avr-binutils \
+                avr-libc \
+                avr-gcc \
+                base-devel \
+                dfu-util \
+                diff-utils \
+                gcc \
+                git \
+                unzip \
+                wget \
+                zip
         git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer
         cd /tmp/dfu-programmer
         makepkg -sic
         rm -rf /tmp/dfu-programmer/
+
 elif grep ID /etc/os-release | grep -q gentoo; then
-  echo "This script will make a USE change in order to ensure that that QMK works on your system. All changes will be sent to the the file /etc/portage/package.use/qmk_firmware -- please review it, and read Portage's output carefully before installing any packages on your system. You will also need to ensure that your kernel is compiled with support for the keyboard chip that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki."
-  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
-      sudo touch /etc/portage/package.use/qmkfirmware
-      echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware > /dev/null
-      sudo emerge -auN sys-devel/gcc app-arch/unzip app-arch/zip net-misc/wget app-mobilephone/dfu-util sys-devel/crossdev dev-embedded/avrdude
-      sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr
-      echo Done!
-    else
-    echo "Quitting..."
-fi
+        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
+                sudo touch /etc/portage/package.use/qmkfirmware
+                echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware > /dev/null
+                sudo emerge -auN \
+                        app-arch/unzip \
+                        app-arch/zip \
+                        app-mobilephone/dfu-util \
+                        net-misc/wget \
+                        sys-devel/gcc \
+                        sys-devel/crossdev dev-embedded/avrdude
+                sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr
+                echo Done!
+        else
+                echo "Quitting..."
+        fi
+
 else
         echo "Sorry, we don't recognize your OS. Help us by contributing support!"
         echo