Merge branch 'master' into hf/shinydox

[qmk_firmware.git] / util / win_shared_install.sh

diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index cfae5784518e38a0c779468934138db11ba7be46..f24ec08e8eccd38552ae9cef720d667806782e90 100644 (file)
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -18,8 +18,11 @@ function install_utils {
     wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip'
     unzip teensy_loader_cli_windows.zip
 
+    # This URL has changed and I can't find the new location. Commenting out until we figure out the new URL or determine this isn't needed. -skullY
     echo "Installing Atmel Flip"
-    wget 'http://www.atmel.com/images/Flip%20Installer%20-%203.4.7.112.exe'
+    wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe'
+    # This is the JRE-less installer, if we need the larger bundled with JRE installer, use this: 
+    #wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/JRE%20-%20Flip%20Installer%20-%203.4.7.112.exe'
     mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
 
     echo "Downloading the QMK driver installer"
@@ -55,21 +58,6 @@ else
     done
 fi
 
-pushd "$download_dir"
-while true; do
-    echo
-    echo "Flip need to be installed if you want to use that for programming."
-    echo "Please install it to the default location!"
-    read -p "Do you want to install it now? (Y/N) " res
-    case $res in
-        [Yy]* ) cmd.exe /c FlipInstaller.exe; break;;
-        [Nn]* ) break;;
-        * ) echo "Invalid answer";;
-    esac
-done
-popd
-
-
 while true; do
     echo
     echo "Which USB drivers do you want to install?"