diff options
| -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 a6ed9b712..afff5addc 100644 --- a/util/activate_wsl.sh +++ b/util/activate_wsl.sh | |||
| @@ -6,7 +6,7 @@ download_dir=$util_dir/wsl_downloaded | |||
| 6 | export DFU_PROGRAMMER=$download_dir/dfu-programmer/dfu-programmer.exe | 6 | export DFU_PROGRAMMER=$download_dir/dfu-programmer/dfu-programmer.exe |
| 7 | export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe | 7 | export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe |
| 8 | export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe | 8 | export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe |
| 9 | export BATCHISP=$download_dir/Flip/bin/batchisp.exe | 9 | export BATCHISP=batchisp.exe |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | 12 | ||
diff --git a/util/wsl_install.sh b/util/wsl_install.sh index 314f520b9..b1e47d637 100644 --- a/util/wsl_install.sh +++ b/util/wsl_install.sh | |||
| @@ -22,13 +22,12 @@ function install_utils { | |||
| 22 | 22 | ||
| 23 | echo "Installing Atmel Flip" | 23 | echo "Installing Atmel Flip" |
| 24 | wget 'http://www.atmel.com/images/Flip%20Installer%20-%203.4.7.112.exe' | 24 | wget 'http://www.atmel.com/images/Flip%20Installer%20-%203.4.7.112.exe' |
| 25 | 7z x -oFlip Flip\ Installer\ -\ 3.4.7.112.exe | 25 | mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe |
| 26 | 26 | ||
| 27 | echo "Downloading the QMK driver installer" | 27 | echo "Downloading the QMK driver installer" |
| 28 | 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 - | 28 | 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 - |
| 29 | 29 | ||
| 30 | rm -f *.zip | 30 | rm -f *.zip |
| 31 | rm Flip\ Installer\ -\ 3.4.7.112.exe | ||
| 32 | 31 | ||
| 33 | popd > /dev/null | 32 | popd > /dev/null |
| 34 | } | 33 | } |
| @@ -85,6 +84,17 @@ fi | |||
| 85 | 84 | ||
| 86 | while true; do | 85 | while true; do |
| 87 | echo | 86 | echo |
| 87 | 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 | ||
| 88 | case $res in | ||
| 89 | [Yy]* ) cmd.exe /c $download_dir\\FlipInstaller.exe; break;; | ||
| 90 | [Nn]* ) break;; | ||
| 91 | * ) echo "Invalid answer";; | ||
| 92 | esac | ||
| 93 | done | ||
| 94 | |||
| 95 | |||
| 96 | while true; do | ||
| 97 | echo | ||
| 88 | echo "Which USB drivers do you want to install?" | 98 | echo "Which USB drivers do you want to install?" |
| 89 | echo "(A)all - All supported drivers will be installed" | 99 | echo "(A)all - All supported drivers will be installed" |
| 90 | echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode) will be installed" | 100 | 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." | |||
| 106 | read -p "Press any key to continue (ctrl-c to abort)" | 116 | read -p "Press any key to continue (ctrl-c to abort)" |
| 107 | ln -sf "$dir" ~/qmk_utils | 117 | ln -sf "$dir" ~/qmk_utils |
| 108 | 118 | ||
| 119 | echo | ||
| 120 | echo "******************************************************************************" | ||
| 121 | echo "Installation completed!" | ||
| 122 | echo "You need to open a new batch command prompt for all the utils to work properly" | ||
| 123 | echo "******************************************************************************" | ||
| 124 | |||
| 109 | popd > /dev/null | 125 | popd > /dev/null |
| 110 | 126 | ||
