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 qmk_firmware-b386ccc78608fa004f51ed245fc14cf5fbd0877c.zip | |
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") | |||
| 12 | 12 | ||
| 13 | # For those distros that do not package bootloadHID | 13 | # For those distros that do not package bootloadHID |
| 14 | install_bootloadhid() { | 14 | install_bootloadhid() { |
| 15 | wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp | 15 | wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp |
| 16 | cd /tmp/bootloadHID.2012-12-08/commandline/ | 16 | cd /tmp/bootloadHID.2012-12-08/commandline/ |
| 17 | make | 17 | if make; then |
| 18 | if [ $? == 0 ]; then | ||
| 19 | sudo cp bootloadHID /usr/local/bin | 18 | sudo cp bootloadHID /usr/local/bin |
| 20 | fi | 19 | fi |
| 21 | cd - | 20 | cd - |
| 22 | } | 21 | } |
| 23 | 22 | ||
| 24 | if grep ID /etc/os-release | grep -qE "fedora"; then | 23 | 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 | |||
| 68 | libnewlib-arm-none-eabi \ | 67 | libnewlib-arm-none-eabi \ |
| 69 | libusb-dev \ | 68 | libusb-dev \ |
| 70 | python3 \ | 69 | python3 \ |
| 70 | python3-pip \ | ||
| 71 | unzip \ | 71 | unzip \ |
| 72 | wget \ | 72 | wget \ |
| 73 | zip | 73 | zip |
