diff options
Diffstat (limited to 'util/msys2_install.sh')
| -rwxr-xr-x | util/msys2_install.sh | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/util/msys2_install.sh b/util/msys2_install.sh index c223e52fa..5abe4a597 100755 --- a/util/msys2_install.sh +++ b/util/msys2_install.sh | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | 2 | ||
| 3 | dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) | ||
| 4 | download_dir=~/qmk_utils | ||
| 5 | util_dir=$(dirname "$0") | 3 | util_dir=$(dirname "$0") |
| 6 | 4 | ||
| 7 | echo "Installing dependencies needed for the installation" | 5 | echo "Installing dependencies needed for the installation" |
| @@ -12,26 +10,13 @@ pacman --needed --noconfirm --disable-download-timeout -Sy \ | |||
| 12 | mingw-w64-x86_64-arm-none-eabi-binutils mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-arm-none-eabi-newlib \ | 10 | mingw-w64-x86_64-arm-none-eabi-binutils mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-arm-none-eabi-newlib \ |
| 13 | mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-dfu-util mingw-w64-x86_64-teensy-loader-cli | 11 | mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-dfu-util mingw-w64-x86_64-teensy-loader-cli |
| 14 | 12 | ||
| 15 | source "$dir/win_shared_install.sh" | 13 | echo "Installing drivers" |
| 14 | tmpdir=$(mktemp -d) | ||
| 15 | cp "${util_dir}/drivers.txt" $tmpdir | ||
| 16 | pushd $tmpdir > /dev/null | ||
| 17 | wget "https://github.com/qmk/qmk_driver_installer/releases/download/v1.01/qmk_driver_installer.exe" | ||
| 18 | cmd.exe //c "qmk_driver_installer.exe --all --force drivers.txt" | ||
| 19 | popd > /dev/null | ||
| 20 | rm -r $tmpdir | ||
| 16 | 21 | ||
| 17 | pip3 install -r "${util_dir}/../requirements.txt" | 22 | pip3 install -r "${util_dir}/../requirements.txt" |
| 18 | |||
| 19 | cp -f "$dir/activate_msys2.sh" "$download_dir/" | ||
| 20 | |||
| 21 | if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc | ||
| 22 | then | ||
| 23 | echo | ||
| 24 | echo "The line source ~/qmk_utils/activate_msys2.sh is already added to your /.bashrc" | ||
| 25 | echo "Not adding it twice!" | ||
| 26 | else | ||
| 27 | echo | ||
| 28 | echo "Adding 'source ~/qmk_utils/activate_msys2.sh' to the end of your" | ||
| 29 | echo ".bashrc file. Without this make won't find the needed utils." | ||
| 30 | echo "source ~/qmk_utils/activate_msys2.sh" >> ~/.bashrc; | ||
| 31 | fi | ||
| 32 | |||
| 33 | echo | ||
| 34 | echo "******************************************************************************" | ||
| 35 | echo "Installation completed!" | ||
| 36 | echo "Please close this Window and restart MSYS2 MinGW" | ||
| 37 | echo "******************************************************************************" | ||
