X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fmsys2_install.sh;h=bcb628ab21f23c3622b07325c14509534c3f54a8;hb=da86484027f6f5deb33799a67a5053bdaa330f51;hp=a0548ad9bcd96b8c3a887b0f262a42f266304612;hpb=82c02d9b8d30cac7ab0b0d21e9d81c1a70df73c1;p=qmk_firmware.git diff --git a/util/msys2_install.sh b/util/msys2_install.sh index a0548ad9b..bcb628ab2 100755 --- a/util/msys2_install.sh +++ b/util/msys2_install.sh @@ -7,15 +7,16 @@ armtools=gcc-arm-none-eabi installflip=false 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://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.6.1.1752-win32.any.x86.zip" - 7z x avr8-gnu-toolchain-3.6.1.1752-win32.any.x86.zip - mv avr8-gnu-toolchain-win32_x86/ avr8-gnu-toolchain + 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