diff options
Diffstat (limited to 'util')
-rwxr-xr-x | util/freebsd_install.sh | 2 | ||||
-rwxr-xr-x | util/linux_install.sh | 5 | ||||
-rwxr-xr-x | util/macos_install.sh | 3 | ||||
-rwxr-xr-x | util/msys2_install.sh | 3 | ||||
-rwxr-xr-x | util/wsl_install.sh | 5 |
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 |
2 | util_dir=$(dirname "$0") | ||
2 | pkg update | 3 | pkg update |
3 | pkg install -y \ | 4 | pkg 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 |
21 | pip3 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 | ||
9 | SOLUS_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" | 9 | SOLUS_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 | ||
11 | util_dir=$(dirname "$0") | ||
12 | |||
11 | if grep ID /etc/os-release | grep -qE "fedora"; then | 13 | if 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" |
185 | fi | 187 | fi |
188 | |||
189 | # Global install tasks | ||
190 | pip3 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 | ||
3 | util_dir=$(dirname "$0") | ||
4 | |||
3 | if ! brew --version 2>&1 > /dev/null; then | 5 | if ! 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 | |||
24 | brew update | 26 | brew update |
25 | brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3 | 27 | brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3 |
26 | brew link --force avr-gcc@8 | 28 | brew link --force avr-gcc@8 |
29 | pip3 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 | |||
5 | avrtools=avr8-gnu-toolchain | 5 | avrtools=avr8-gnu-toolchain |
6 | armtools=gcc-arm-none-eabi | 6 | armtools=gcc-arm-none-eabi |
7 | installflip=false | 7 | installflip=false |
8 | util_dir=$(dirname "$0") | ||
8 | 9 | ||
9 | echo "Installing dependencies needed for the installation (quazip)" | 10 | echo "Installing dependencies needed for the installation (quazip)" |
10 | pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip | 11 | pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip |
@@ -92,6 +93,8 @@ else | |||
92 | fi | 93 | fi |
93 | popd | 94 | popd |
94 | 95 | ||
96 | pip3 install -r ${util_dir}/../requirements.txt | ||
97 | |||
95 | cp -f "$dir/activate_msys2.sh" "$download_dir/" | 98 | cp -f "$dir/activate_msys2.sh" "$download_dir/" |
96 | 99 | ||
97 | if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc | 100 | if 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 | ||
3 | dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) | 3 | util_dir=$(dirname "$0") |
4 | dir=$(cd -P -- "$util_dir" && pwd -P) | ||
4 | pushd "$dir"; | 5 | pushd "$dir"; |
5 | 6 | ||
6 | if [[ $dir != /mnt/* ]]; | 7 | if [[ $dir != /mnt/* ]]; |
@@ -28,6 +29,8 @@ download_dir=wsl_downloaded | |||
28 | 29 | ||
29 | source "$dir/win_shared_install.sh" | 30 | source "$dir/win_shared_install.sh" |
30 | 31 | ||
32 | pip3 install -r ${util_dir}/../requirements.txt | ||
33 | |||
31 | pushd "$download_dir" | 34 | pushd "$download_dir" |
32 | while true; do | 35 | while true; do |
33 | echo | 36 | echo |