Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix/remove missing package (#7897)

Browse source 
* [fix] yay instead pacman install bootloadhid

* [fix] add needed option

* [mod] output red color

* [fix] overwrite avr-gcc package

* [mod] disable install bootloadhid from aur and check already installed

* Apply suggestions from code review

Co-Authored-By: Joel Challis <git@zvecr.com>

* Update util/linux_install.sh

Co-Authored-By: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
This commit is contained in:
dohq 2020-01-28 09:23:24 +09:00 committed by Joel Challis
parent 1b7a003d84
commit a539bd63fe
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/linux_install.sh
View file

@ -12,12 +12,14 @@ util_dir=$(dirname "$0")
# For those distros that do not package bootloadHID # For those distros that do not package bootloadHID
install_bootloadhid() { install_bootloadhid() {
if ! command -v bootloadHID >/dev/null; then
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/ cd /tmp/bootloadHID.2012-12-08/commandline/
if make; then if make; then
sudo cp bootloadHID /usr/local/bin sudo cp bootloadHID /usr/local/bin
fi fi
cd - cd -
fi
} }
if grep ID /etc/os-release | grep -qE "fedora"; then if grep ID /etc/os-release | grep -qE "fedora"; then
@ -73,7 +75,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
zip zip
elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz sudo pacman --needed -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz
sudo pacman -S --needed \ sudo pacman -S --needed \
arm-none-eabi-binutils \ arm-none-eabi-binutils \
arm-none-eabi-gcc \ arm-none-eabi-gcc \
@ -81,9 +83,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
avrdude \ avrdude \
avr-binutils \ avr-binutils \
avr-libc \ avr-libc \
avr-gcc \
base-devel \ base-devel \
bootloadhid \
clang \ clang \
dfu-programmer \ dfu-programmer \
dfu-util \ dfu-util \