aboutsummaryrefslogtreecommitdiff
path: root/util/install
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-05-19 15:49:11 -0700
committerZach White <skullydazed@gmail.com>2021-05-19 15:49:11 -0700
commit6955c5a00295382d3b4151a840aa5c929cd98059 (patch)
tree26109c4ed2a266650fc5fad19ce5f784bc7c346b /util/install
parent82aa9ad4a567695d1f7d0b1e36bf8563d2967813 (diff)
parentdb1eacdaacb9c8f6889f46bc1c6af155b81ad72a (diff)
downloadqmk_firmware-6955c5a00295382d3b4151a840aa5c929cd98059.tar.gz
qmk_firmware-6955c5a00295382d3b4151a840aa5c929cd98059.zip
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts: lib/python/qmk/tests/test_cli_commands.py util/install/fedora.sh
Diffstat (limited to 'util/install')
-rwxr-xr-xutil/install/debian.sh2
-rwxr-xr-xutil/install/fedora.sh2
-rwxr-xr-xutil/install/freebsd.sh2
-rwxr-xr-xutil/install/msys2.sh2
-rwxr-xr-xutil/install/void.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/util/install/debian.sh b/util/install/debian.sh
index ef87c41b5..380348237 100755
--- a/util/install/debian.sh
+++ b/util/install/debian.sh
@@ -5,7 +5,7 @@ DEBCONF_NONINTERACTIVE_SEEN=true
5export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN 5export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
6 6
7_qmk_install_prepare() { 7_qmk_install_prepare() {
8 sudo apt-get update 8 sudo apt-get update $SKIP_PROMPT
9} 9}
10 10
11_qmk_install() { 11_qmk_install() {
diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 10fc7c8ad..3f9695356 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -4,7 +4,7 @@ _qmk_install() {
4 echo "Installing dependencies" 4 echo "Installing dependencies"
5 5
6 # TODO: Check whether devel/headers packages are really needed 6 # TODO: Check whether devel/headers packages are really needed
7 sudo dnf -y install \ 7 sudo dnf $SKIP_PROMPT install \
8 clang diffutils git gcc glibc-headers kernel-devel kernel-headers \ 8 clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
9 make unzip wget zip python3 avr-binutils avr-gcc avr-libc \ 9 make unzip wget zip python3 avr-binutils avr-gcc avr-libc \
10 arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \ 10 arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
diff --git a/util/install/freebsd.sh b/util/install/freebsd.sh
index 353c52d64..d9399a5de 100755
--- a/util/install/freebsd.sh
+++ b/util/install/freebsd.sh
@@ -1,7 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3_qmk_install_prepare() { 3_qmk_install_prepare() {
4 sudo pkg update 4 sudo pkg update $SKIP_PROMPT
5} 5}
6 6
7_qmk_install() { 7_qmk_install() {
diff --git a/util/install/msys2.sh b/util/install/msys2.sh
index 9b8343aed..b027ff53d 100755
--- a/util/install/msys2.sh
+++ b/util/install/msys2.sh
@@ -1,7 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3_qmk_install_prepare() { 3_qmk_install_prepare() {
4 pacman -Syu 4 pacman -Syu $MSYS2_CONFIRM
5} 5}
6 6
7_qmk_install() { 7_qmk_install() {
diff --git a/util/install/void.sh b/util/install/void.sh
index 9ec7019e5..c49c3ef63 100755
--- a/util/install/void.sh
+++ b/util/install/void.sh
@@ -3,7 +3,7 @@
3_qmk_install() { 3_qmk_install() {
4 echo "Installing dependencies" 4 echo "Installing dependencies"
5 5
6 sudo xbps-install \ 6 sudo xbps-install $SKIP_PROMPT \
7 gcc git make wget unzip zip \ 7 gcc git make wget unzip zip \
8 python3-pip \ 8 python3-pip \
9 avr-binutils avr-gcc avr-libc \ 9 avr-binutils avr-gcc avr-libc \