aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xutil/linux_install.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh
index 922981418..048b2f318 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -12,12 +12,14 @@ util_dir=$(dirname "$0")
12 12
13# For those distros that do not package bootloadHID 13# For those distros that do not package bootloadHID
14install_bootloadhid() { 14install_bootloadhid() {
15 wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp 15 if ! command -v bootloadHID >/dev/null; then
16 cd /tmp/bootloadHID.2012-12-08/commandline/ 16 wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp
17 if make; then 17 cd /tmp/bootloadHID.2012-12-08/commandline/
18 sudo cp bootloadHID /usr/local/bin 18 if make; then
19 sudo cp bootloadHID /usr/local/bin
20 fi
21 cd -
19 fi 22 fi
20 cd -
21} 23}
22 24
23if grep ID /etc/os-release | grep -qE "fedora"; then 25if grep ID /etc/os-release | grep -qE "fedora"; then
@@ -73,7 +75,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
73 zip 75 zip
74 76
75elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then 77elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
76 sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz 78 sudo pacman --needed -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz
77 sudo pacman -S --needed \ 79 sudo pacman -S --needed \
78 arm-none-eabi-binutils \ 80 arm-none-eabi-binutils \
79 arm-none-eabi-gcc \ 81 arm-none-eabi-gcc \
@@ -81,9 +83,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
81 avrdude \ 83 avrdude \
82 avr-binutils \ 84 avr-binutils \
83 avr-libc \ 85 avr-libc \
84 avr-gcc \
85 base-devel \ 86 base-devel \
86 bootloadhid \
87 clang \ 87 clang \
88 dfu-programmer \ 88 dfu-programmer \
89 dfu-util \ 89 dfu-util \