aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/freebsd_install.sh2
-rwxr-xr-xutil/linux_install.sh5
-rwxr-xr-xutil/macos_install.sh3
-rwxr-xr-xutil/msys2_install.sh3
-rwxr-xr-xutil/wsl_install.sh5
5 files changed, 17 insertions, 1 deletions
diff --git a/util/freebsd_install.sh b/util/freebsd_install.sh
index c8696e8cc..815759203 100755
--- a/util/freebsd_install.sh
+++ b/util/freebsd_install.sh
@@ -1,4 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2util_dir=$(dirname "$0")
2pkg update 3pkg update
3pkg install -y \ 4pkg install -y \
4 git \ 5 git \
@@ -17,3 +18,4 @@ pkg install -y \
17 arm-none-eabi-newlib \ 18 arm-none-eabi-newlib \
18 diffutils \ 19 diffutils \
19 python3 20 python3
21pip3 install -r ${util_dir}/../requirements.txt
diff --git a/util/linux_install.sh b/util/linux_install.sh
index 4731ec015..d21cd3c1c 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -8,6 +8,8 @@ SLACKWARE_WARNING="You will need the following packages from slackbuilds.org:\n\
8 8
9SOLUS_INFO="Your tools are now installed. To start using them, open new terminal or source these scripts:\n\t/usr/share/defaults/etc/profile.d/50-arm-toolchain-path.sh\n\t/usr/share/defaults/etc/profile.d/50-avr-toolchain-path.sh" 9SOLUS_INFO="Your tools are now installed. To start using them, open new terminal or source these scripts:\n\t/usr/share/defaults/etc/profile.d/50-arm-toolchain-path.sh\n\t/usr/share/defaults/etc/profile.d/50-avr-toolchain-path.sh"
10 10
11util_dir=$(dirname "$0")
12
11if grep ID /etc/os-release | grep -qE "fedora"; then 13if grep ID /etc/os-release | grep -qE "fedora"; then
12 sudo dnf install \ 14 sudo dnf install \
13 arm-none-eabi-binutils-cs \ 15 arm-none-eabi-binutils-cs \
@@ -183,3 +185,6 @@ else
183 echo 185 echo
184 echo "https://docs.qmk.fm/#/contributing" 186 echo "https://docs.qmk.fm/#/contributing"
185fi 187fi
188
189# Global install tasks
190pip3 install -r ${util_dir}/../requirements.txt
diff --git a/util/macos_install.sh b/util/macos_install.sh
index 915ff3143..f7e304424 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -1,5 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3util_dir=$(dirname "$0")
4
3if ! brew --version 2>&1 > /dev/null; then 5if ! brew --version 2>&1 > /dev/null; then
4 echo "Error! Homebrew not installed or broken!" 6 echo "Error! Homebrew not installed or broken!"
5 echo -n "Would you like to install homebrew now? [y/n] " 7 echo -n "Would you like to install homebrew now? [y/n] "
@@ -24,3 +26,4 @@ brew tap PX4/homebrew-px4
24brew update 26brew update
25brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3 27brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
26brew link --force avr-gcc@8 28brew link --force avr-gcc@8
29pip3 install -r ${util_dir}/../requirements.txt
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index bcb628ab2..bed176da6 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -5,6 +5,7 @@ download_dir=~/qmk_utils
5avrtools=avr8-gnu-toolchain 5avrtools=avr8-gnu-toolchain
6armtools=gcc-arm-none-eabi 6armtools=gcc-arm-none-eabi
7installflip=false 7installflip=false
8util_dir=$(dirname "$0")
8 9
9echo "Installing dependencies needed for the installation (quazip)" 10echo "Installing dependencies needed for the installation (quazip)"
10pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip 11pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip
@@ -92,6 +93,8 @@ else
92fi 93fi
93popd 94popd
94 95
96pip3 install -r ${util_dir}/../requirements.txt
97
95cp -f "$dir/activate_msys2.sh" "$download_dir/" 98cp -f "$dir/activate_msys2.sh" "$download_dir/"
96 99
97if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc 100if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc
diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index c2c206d2b..197d9f089 100755
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -1,6 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) 3util_dir=$(dirname "$0")
4dir=$(cd -P -- "$util_dir" && pwd -P)
4pushd "$dir"; 5pushd "$dir";
5 6
6if [[ $dir != /mnt/* ]]; 7if [[ $dir != /mnt/* ]];
@@ -28,6 +29,8 @@ download_dir=wsl_downloaded
28 29
29source "$dir/win_shared_install.sh" 30source "$dir/win_shared_install.sh"
30 31
32pip3 install -r ${util_dir}/../requirements.txt
33
31pushd "$download_dir" 34pushd "$download_dir"
32while true; do 35while true; do
33 echo 36 echo