From 517f6d2c22adb0132e74396c08e21f35ae64118b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 14 Aug 2020 08:26:14 +1000
Subject: MSYS2: install packages for dfu-programmer, dfu-util,
 teensy-loader-cli (#10007)

---
 util/activate_msys2.sh     |  2 --
 util/activate_wsl.sh       |  4 ----
 util/msys2_install.sh      |  4 +++-
 util/win_shared_install.sh | 13 -------------
 4 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'util')

diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh
index f6e19f99d..b003c1a78 100755
--- a/util/activate_msys2.sh
+++ b/util/activate_msys2.sh
@@ -3,8 +3,6 @@
 function export_variables {
     local util_dir=~/qmk_utils
     export PATH=$PATH:$util_dir
-    export PATH=$PATH:$util_dir/dfu-programmer
-    export PATH=$PATH:$util_dir/dfu-util-0.9-win64
     export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
     export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
 }
diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh
index 7f6f54731..45cd945ef 100755
--- a/util/activate_wsl.sh
+++ b/util/activate_wsl.sh
@@ -3,10 +3,6 @@
 function export_variables {
     local util_dir=~/qmk_utils
     local download_dir=$util_dir/wsl_downloaded
-
-    export DFU_PROGRAMMER=$download_dir/dfu-programmer/dfu-programmer.exe
-    export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe
-    export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
 }
 
 export_variables
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 1b50bba70..1351aa5d7 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -20,7 +20,7 @@ function install_avr {
     rm avr8-gnu-toolchain/bin/make.exe
     rm avr-gcc-8.3.0-x86-mingw.zip
 
-    pacman --needed --disable-download-timeout -S mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid
+    pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
 }
 
 function install_arm {
@@ -29,6 +29,8 @@ function install_arm {
     echo "Extracting ARM toolchain..."
     unzip -q -d gcc-arm-none-eabi gcc-arm-none-eabi-8-2019-q3-update-win32.zip
     rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
+
+    pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-dfu-util
 }
 
 pushd "$download_dir"
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index 17282bc94..f45ca3517 100755
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -6,18 +6,6 @@ function install_utils {
 
     pushd "$download_dir"
 
-    echo "Installing dfu-programmer"
-    wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip'
-    unzip -d dfu-programmer dfu-programmer-win-0.7.2.zip
-
-    echo "Installing dfu-util"
-    wget 'http://dfu-util.sourceforge.net/releases/dfu-util-0.9-win64.zip'
-    unzip dfu-util-0.9-win64.zip
-
-    echo "Installing teensy_loader_cli"
-    wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip'
-    unzip teensy_loader_cli_windows.zip
-
     echo "Downloading the QMK driver installer"
     wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i -
 
@@ -73,4 +61,3 @@ done
 
 
 popd > /dev/null
-
-- 
cgit v1.2.3-70-g09d2