diff options
| author | skullY <skullydazed@gmail.com> | 2018-10-09 11:35:31 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-10-22 13:24:43 -0700 |
| commit | 11c4c711310d297a378f029b7ffa1409d5a04dbc (patch) | |
| tree | ce22c6048ea624ce4b5eae4528faa8085995067d | |
| parent | 79d495f51dd0d49a4e0ba84f3bcec588dba498b5 (diff) | |
| download | qmk_firmware-11c4c711310d297a378f029b7ffa1409d5a04dbc.tar.gz qmk_firmware-11c4c711310d297a378f029b7ffa1409d5a04dbc.zip | |
Fixup the WSL install
| -rw-r--r-- | util/win_shared_install.sh | 3 | ||||
| -rw-r--r-- | util/wsl_install.sh | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh index f24ec08e8..c7517881e 100644 --- a/util/win_shared_install.sh +++ b/util/win_shared_install.sh | |||
| @@ -18,11 +18,8 @@ function install_utils { | |||
| 18 | wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip' | 18 | wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip' |
| 19 | unzip teensy_loader_cli_windows.zip | 19 | unzip teensy_loader_cli_windows.zip |
| 20 | 20 | ||
| 21 | # 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 | ||
| 22 | echo "Installing Atmel Flip" | 21 | echo "Installing Atmel Flip" |
| 23 | wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe' | 22 | wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe' |
| 24 | # This is the JRE-less installer, if we need the larger bundled with JRE installer, use this: | ||
| 25 | #wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/JRE%20-%20Flip%20Installer%20-%203.4.7.112.exe' | ||
| 26 | mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe | 23 | mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe |
| 27 | 24 | ||
| 28 | echo "Downloading the QMK driver installer" | 25 | echo "Downloading the QMK driver installer" |
diff --git a/util/wsl_install.sh b/util/wsl_install.sh index d11c78ac7..c2c206d2b 100644 --- a/util/wsl_install.sh +++ b/util/wsl_install.sh | |||
| @@ -15,20 +15,15 @@ fi | |||
| 15 | while true; do | 15 | while true; do |
| 16 | echo | 16 | echo |
| 17 | echo "Do you want to install all toolchain dependencies needed for compiling QMK?" | 17 | echo "Do you want to install all toolchain dependencies needed for compiling QMK?" |
| 18 | echo "This will run install_dependencies.sh, which calls apt-get upgrade." | ||
| 19 | echo "If you don't want that, you can install the dependencies manually." | 18 | echo "If you don't want that, you can install the dependencies manually." |
| 20 | read -p "(Y/N) " res | 19 | read -p "(Y/N) " res |
| 21 | case $res in | 20 | case $res in |
| 22 | [Yy]* ) sudo ./install_dependencies.sh; break;; | 21 | [Yy]* ) ./linux_install.sh; break;; |
| 23 | [Nn]* ) break;; | 22 | [Nn]* ) break;; |
| 24 | * ) echo "Invalid answer";; | 23 | * ) echo "Invalid answer";; |
| 25 | esac | 24 | esac |
| 26 | done | 25 | done |
| 27 | 26 | ||
| 28 | echo "Installing dependencies needed for the installation (unzip, wget)" | ||
| 29 | echo "This will ask for the sudo password" | ||
| 30 | sudo apt-get install unzip wget | ||
| 31 | |||
| 32 | download_dir=wsl_downloaded | 27 | download_dir=wsl_downloaded |
| 33 | 28 | ||
| 34 | source "$dir/win_shared_install.sh" | 29 | source "$dir/win_shared_install.sh" |
