aboutsummaryrefslogtreecommitdiffstats
path: root/util/msys2_install.sh
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-04 19:43:45 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-04 19:43:45 +1100
commit2bb2977c133646c4e056960e72029270d77cc1eb (patch)
tree235d491f992121ac1716c5bf2fafb80983748576 /util/msys2_install.sh
parenta55c838961c89097ab849ed6cb1f261791e6b9b4 (diff)
parent47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff)
downloadfirmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.gz
firmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.bz2
firmware-2bb2977c133646c4e056960e72029270d77cc1eb.zip
Merge branch 'master' into debounce_refactor
# Conflicts: # tmk_core/common/keyboard.c
Diffstat (limited to 'util/msys2_install.sh')
-rwxr-xr-x[-rw-r--r--]util/msys2_install.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index d9459580c..fcb488249 100644..100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -13,9 +13,12 @@ source "$dir/win_shared_install.sh"
function install_avr {
rm -f -r "$avrtools"
- wget "http://ww1.microchip.com/downloads/en/DeviceDoc/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
}