diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-05-28 20:36:27 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2017-05-28 21:30:55 +0300 |
| commit | 3d3999d8635d1c9ca5a0276545ce4bdc173aa9a4 (patch) | |
| tree | 8a121a0117e670591ecba855e5d9c94cbc54cc17 | |
| parent | b8899b48b45c0209e44cc35d9185aa670e769d40 (diff) | |
Actually install flip instead of just extracting
| -rw-r--r-- | util/activate_wsl.sh | 2 | ||||
| -rw-r--r-- | util/wsl_install.sh | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh index a6ed9b712d..afff5addcc 100644 --- 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 314f520b95..b1e47d637b 100644 --- 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 } @@ -85,6 +84,17 @@ 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" @@ -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 |