Remove more commented out MCUs

[qmk_firmware.git] / util / win_shared_install.sh

diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
old mode 100644 (file)
new mode 100755 (executable)
index c30e287..c751788
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
 
-download_dir=win_downloaded
-wsl_download_dir=wsl_downloaded
-
 function install_utils {
-    rm -f -r $download_dir
-    mkdir $download_dir
+    rm -f -r "$download_dir"
+    mkdir "$download_dir"
 
-    pushd $download_dir
+    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'
@@ -22,7 +19,7 @@ function install_utils {
     unzip teensy_loader_cli_windows.zip
 
     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'
     mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
 
     echo "Downloading the QMK driver installer"
@@ -34,25 +31,22 @@ function install_utils {
 }
 
 function install_drivers {
-    pushd $download_dir
+    pushd "$download_dir"
+    cp -f "$dir/drivers.txt" .
     echo 
-    cmd.exe /c "qmk_driver_installer.exe $1 $2 ..\\drivers.txt"
+    cmd.exe /c "qmk_driver_installer.exe $1 $2 drivers.txt"
     popd > /dev/null
 }
 
 pushd "$dir"
 
-if [ -d "$wsl_download_dir" ]; then
-    echo "Renaming existing wsl_download_dir to win_download"
-    mv -f "$wsl_download_dir" "$download_dir"
-fi
-
 if [ ! -d "$download_dir" ]; then
     install_utils
 else
     while true; do
         echo
-        read -p "The utils seem to already be downloaded, do you want to re-download them and update to the newest version (Y/N) " res
+        echo "The utils seem to already be downloaded."
+        read -p "Do you want to re-download them and update to the newest version (Y/N) " res
         case $res in
             [Yy]* ) install_utils; break;;
             [Nn]* ) break;;
@@ -61,24 +55,16 @@ else
     done
 fi
 
-while true; do
-    echo
-    read -p "Flip need to be installed if you want to use that for programming, do you want to install it now? (Y/N) " res
-    case $res in
-        [Yy]* ) cmd.exe /c $download_dir\\FlipInstaller.exe; break;;
-        [Nn]* ) break;;
-        * ) echo "Invalid answer";;
-    esac
-done
-
-
 while true; do
     echo
     echo "Which USB drivers do you want to install?"
     echo "(A)all - All supported drivers will be installed"
-    echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode) will be installed"
-    echo "(F)force - Like all, but will also override existing drivers for connected keyboards"
-    echo "(N)one - No drivers will be installed, flashing your keyboard will most likely not work"
+    echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode)"
+    echo "              will be installed"
+    echo "(F)force - Like all, but will also override existing drivers for connected"
+    echo "           keyboards"
+    echo "(N)one - No drivers will be installed,"
+    echo "         flashing your keyboard will most likely not work"
     read -p "(A/C/F/N)? " res
     case $res in
         [Aa]* ) install_drivers --all; break;;