X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fmsys2_install.sh;h=bed176da66d83d551f28e8a709fb1238f41c3aff;hb=a25dd58bc56b0c4010673723ac44eaff914979bb;hp=de03b89ac40d48eb97ac6a2f7a08e10d57989445;hpb=81d7e7d4c8b99e032ce9423da56dba46f8bce18f;p=qmk_firmware.git

diff --git a/util/msys2_install.sh b/util/msys2_install.sh
old mode 100644
new mode 100755
index de03b89ac..bed176da6
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -5,17 +5,22 @@ download_dir=~/qmk_utils
 avrtools=avr8-gnu-toolchain
 armtools=gcc-arm-none-eabi
 installflip=false
+util_dir=$(dirname "$0")
 
 echo "Installing dependencies needed for the installation (quazip)"
-pacman --needed -S msys/unzip msys/p7zip base-devel msys/git mingw-w64-x86_64-toolchain
+pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip
 
 source "$dir/win_shared_install.sh"
 
 function install_avr {
     rm -f -r "$avrtools"
-    wget "http://www.atmel.com/images/avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe"
-    7z x avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe
-    rm avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe
+    wget "http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.6.1.1752-win32.any.x86.zip"
+    echo "Extracting AVR toolchain..."
+	unzip -q avr8-gnu-toolchain-3.6.1.1752-win32.any.x86.zip
+	mv avr8-gnu-toolchain-win32_x86/ avr8-gnu-toolchain
+    rm __MACOSX -R
+    rm avr8-gnu-toolchain-3.6.1.1752-win32.any.x86.zip
+    pacman --needed -S mingw-w64-x86_64-avrdude
 }
 
 function install_arm {
@@ -66,7 +71,7 @@ if [ ! -d "$armtools" ]; then
     while true; do
         echo
         echo "The ARM toolchain is not installed."
-        echo "This is needed for building ARM based keboards."
+        echo "This is needed for building ARM based keyboards."
         read -p "Do you want to install it? (Y/N) " res
         case $res in
             [Yy]* ) install_arm; break;;
@@ -88,6 +93,8 @@ else
 fi
 popd
 
+pip3 install -r ${util_dir}/../requirements.txt
+
 cp -f "$dir/activate_msys2.sh" "$download_dir/"
 
 if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc
@@ -114,4 +121,4 @@ echo
 echo "******************************************************************************"
 echo "Installation completed!"
 echo "Please close this Window and restart MSYS2 MinGW"
-echo "******************************************************************************"
\ No newline at end of file
+echo "******************************************************************************"