diff options
| author | Cory Watson <watson.cory@protonmail.com> | 2019-09-02 10:32:14 -0400 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-09-02 07:32:14 -0700 |
| commit | 05d0e8c09eb972e654e15936aa0118add35f6376 (patch) | |
| tree | d2f7f2575761fb587665bf438feb5ed94b91d350 /util | |
| parent | 19e85a503c790a68deb99266efc24c51a44f897a (diff) | |
| download | qmk_firmware-05d0e8c09eb972e654e15936aa0118add35f6376.tar.gz qmk_firmware-05d0e8c09eb972e654e15936aa0118add35f6376.zip | |
Add `dfu-programmer` to `pacman -S` (#6619)
* Add `dfu-programmer` to `pacman -S` (#6618)
`dfu-programmer` now resides at `extra/dfu-programmer` and is no longer
in the AUR
* Add `--needed` option to `pacman -S` for efficiency
* Fix
* Update util/linux_install.sh
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/linux_install.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh index 5f29cad94..73ba25e13 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh | |||
| @@ -61,7 +61,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then | |||
| 61 | 61 | ||
| 62 | elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then | 62 | elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then |
| 63 | sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz | 63 | sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz |
| 64 | sudo pacman -S \ | 64 | sudo pacman -S --needed \ |
| 65 | arm-none-eabi-binutils \ | 65 | arm-none-eabi-binutils \ |
| 66 | arm-none-eabi-gcc \ | 66 | arm-none-eabi-gcc \ |
| 67 | arm-none-eabi-newlib \ | 67 | arm-none-eabi-newlib \ |
| @@ -71,6 +71,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then | |||
| 71 | avr-gcc \ | 71 | avr-gcc \ |
| 72 | base-devel \ | 72 | base-devel \ |
| 73 | clang \ | 73 | clang \ |
| 74 | dfu-programmer \ | ||
| 74 | dfu-util \ | 75 | dfu-util \ |
| 75 | diffutils \ | 76 | diffutils \ |
| 76 | gcc \ | 77 | gcc \ |
| @@ -79,10 +80,6 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then | |||
| 79 | unzip \ | 80 | unzip \ |
| 80 | wget \ | 81 | wget \ |
| 81 | zip | 82 | zip |
| 82 | git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer | ||
| 83 | cd /tmp/dfu-programmer || exit 1 | ||
| 84 | makepkg -sic | ||
| 85 | rm -rf /tmp/dfu-programmer/ | ||
| 86 | 83 | ||
| 87 | elif grep ID /etc/os-release | grep -q gentoo; then | 84 | elif grep ID /etc/os-release | grep -q gentoo; then |
| 88 | echo "$GENTOO_WARNING" | fmt | 85 | echo "$GENTOO_WARNING" | fmt |
