Actually install flip instead of just extracting

diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh
index a6ed9b712d794e821580fdd206c787a72c64853d..afff5addccc85db55df5fb84ba844fe716af8272 100644 (file)
--- a/util/activate_wsl.sh
+++ b/util/activate_wsl.sh
@@ -6,7 +6,7 @@ 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 BATCHISP=$download_dir/Flip/bin/batchisp.exe
+export BATCHISP=batchisp.exe
 
 
 

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 314f520b95064327f40c886dd46b35a06738975b..b1e47d637b75a7a408c941b5bff70064ffbaab8c 100644 (file)
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -22,13 +22,12 @@ function install_utils {
 
     echo "Installing Atmel Flip"
     wget 'http://www.atmel.com/images/Flip%20Installer%20-%203.4.7.112.exe'
-    7z x -oFlip Flip\ Installer\ -\ 3.4.7.112.exe
+    mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
 
     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 -
 
     rm -f *.zip
-    rm Flip\ Installer\ -\ 3.4.7.112.exe
 
     popd > /dev/null
 }
@@ -83,6 +82,17 @@ 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?"
@@ -106,5 +116,11 @@ echo "This is needed so that the the make system can find all utils it need."
 read -p "Press any key to continue (ctrl-c to abort)"
 ln -sf "$dir" ~/qmk_utils
 
+echo
+echo "******************************************************************************"
+echo "Installation completed!"
+echo "You need to open a new batch command prompt for all the utils to work properly"
+echo "******************************************************************************"
+
 popd > /dev/null