Add user-overridable callback for cancelling UCIS input (#5564)

[qmk_firmware.git] / util / linux_install.sh

diff --git a/util/linux_install.sh b/util/linux_install.sh
index 3df7c0b2ae71d22465bd8af1e17388ef176d4358..d21cd3c1c9f2c9fae9918da458ea60d9e9b1414c 100755 (executable)
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -2,12 +2,14 @@
 
 # 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."
+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/qmkfirmware -- 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."
 
 SLACKWARE_WARNING="You will need the following packages from slackbuilds.org:\n\tarm-binutils\n\tarm-gcc\n\tavr-binutils\n\tavr-gcc\n\tavr-libc\n\tavrdude\n\tdfu-programmer\n\tdfu-util\n\tnewlib\nThese packages will be installed with sudo and sboinstall, so ensure that your user is added to sudoers and that sboinstall is configured."
 
 SOLUS_INFO="Your tools are now installed. To start using them, open new terminal or source these scripts:\n\t/usr/share/defaults/etc/profile.d/50-arm-toolchain-path.sh\n\t/usr/share/defaults/etc/profile.d/50-avr-toolchain-path.sh"
 
+util_dir=$(dirname "$0")
+
 if grep ID /etc/os-release | grep -qE "fedora"; then
        sudo dnf install \
                arm-none-eabi-binutils-cs \
@@ -61,6 +63,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
                arm-none-eabi-binutils \
                arm-none-eabi-gcc \
                arm-none-eabi-newlib \
+               avrdude \
                avr-binutils \
                avr-libc \
                avr-gcc \
@@ -117,7 +120,7 @@ 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
+       if grep ID /etc/os-release | grep -q "15."; then
                CROSS_AVR_GCC=cross-avr-gcc7
                CROSS_ARM_GCC=cross-arm-none-gcc7
        fi
@@ -182,3 +185,6 @@ else
        echo
        echo "https://docs.qmk.fm/#/contributing"
 fi
+
+# Global install tasks
+pip3 install -r ${util_dir}/../requirements.txt