Fix install for Linux Ubuntu (#7520) 0.7.97
authoriKirin <tsuki-shimizu@live.at>
Sun, 1 Dec 2019 21:56:38 +0000 (22:56 +0100)
committerfauxpark <fauxpark@gmail.com>
Sun, 1 Dec 2019 21:56:38 +0000 (08:56 +1100)
* 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

util/linux_install.sh

index 100a14a..9229814 100755 (executable)
@@ -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