summaryrefslogtreecommitdiff
path: root/util/msys2_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'util/msys2_install.sh')
-rwxr-xr-xutil/msys2_install.sh31
1 files changed, 8 insertions, 23 deletions
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index c223e52fae..5abe4a597b 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-download_dir=~/qmk_utils
util_dir=$(dirname "$0")
echo "Installing dependencies needed for the installation"
@@ -12,26 +10,13 @@ pacman --needed --noconfirm --disable-download-timeout -Sy \
mingw-w64-x86_64-arm-none-eabi-binutils mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-arm-none-eabi-newlib \
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
-source "$dir/win_shared_install.sh"
+echo "Installing drivers"
+tmpdir=$(mktemp -d)
+cp "${util_dir}/drivers.txt" $tmpdir
+pushd $tmpdir > /dev/null
+wget "https://github.com/qmk/qmk_driver_installer/releases/download/v1.01/qmk_driver_installer.exe"
+cmd.exe //c "qmk_driver_installer.exe --all --force drivers.txt"
+popd > /dev/null
+rm -r $tmpdir
pip3 install -r "${util_dir}/../requirements.txt"
-
-cp -f "$dir/activate_msys2.sh" "$download_dir/"
-
-if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc
-then
- echo
- echo "The line source ~/qmk_utils/activate_msys2.sh is already added to your /.bashrc"
- echo "Not adding it twice!"
-else
- echo
- echo "Adding 'source ~/qmk_utils/activate_msys2.sh' to the end of your"
- echo ".bashrc file. Without this make won't find the needed utils."
- echo "source ~/qmk_utils/activate_msys2.sh" >> ~/.bashrc;
-fi
-
-echo
-echo "******************************************************************************"
-echo "Installation completed!"
-echo "Please close this Window and restart MSYS2 MinGW"
-echo "******************************************************************************"