diff options
author | iKirin <tsuki-shimizu@live.at> | 2019-12-01 22:56:38 +0100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2019-12-02 08:56:38 +1100 |
commit | b386ccc78608fa004f51ed245fc14cf5fbd0877c (patch) | |
tree | 53943da0dfc6d1967f157f26f06ab60526e1e6cd /util | |
parent | 0ed492978aea83205b73127472c3667c601d515b (diff) | |
download | qmk_firmware-b386ccc78608fa004f51ed245fc14cf5fbd0877c.tar.gz |
Fix install for Linux Ubuntu (#7520)
* Fix linux install for Ubuntu. It failed due to sh not supporting [ and pip being seperate from python3
* Adapted install function according to feedback
* Fix style
Diffstat (limited to 'util')
-rwxr-xr-x | util/linux_install.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh index 100a14a51..922981418 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -12,13 +12,12 @@ util_dir=$(dirname "$0") # For those distros that do not package bootloadHID install_bootloadhid() { - wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp + wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp cd /tmp/bootloadHID.2012-12-08/commandline/ - make - if [ $? == 0 ]; then + if make; then sudo cp bootloadHID /usr/local/bin - fi - cd - + fi + cd - } if grep ID /etc/os-release | grep -qE "fedora"; then @@ -68,6 +67,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then libnewlib-arm-none-eabi \ libusb-dev \ python3 \ + python3-pip \ unzip \ wget \ zip |