Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fixup the WSL install

Browse source
This commit is contained in:
skullY 2018-10-09 11:35:31 -07:00 committed by Drashna Jaelre
parent 79d495f51d
commit 11c4c71131
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
util/win_shared_install.sh
View file

@ -18,11 +18,8 @@ function install_utils {
wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip' wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip'
unzip teensy_loader_cli_windows.zip unzip teensy_loader_cli_windows.zip
# 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
echo "Installing Atmel Flip" echo "Installing Atmel Flip"
wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe' wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe'
# This is the JRE-less installer, if we need the larger bundled with JRE installer, use this:
#wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/JRE%20-%20Flip%20Installer%20-%203.4.7.112.exe'
mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe
echo "Downloading the QMK driver installer" echo "Downloading the QMK driver installer"

7
util/wsl_install.sh
View file

@ -15,20 +15,15 @@ fi
while true; do while true; do
echo echo
echo "Do you want to install all toolchain dependencies needed for compiling QMK?" echo "Do you want to install all toolchain dependencies needed for compiling QMK?"
echo "This will run install_dependencies.sh, which calls apt-get upgrade."
echo "If you don't want that, you can install the dependencies manually." echo "If you don't want that, you can install the dependencies manually."
read -p "(Y/N) " res read -p "(Y/N) " res
case $res in case $res in
[Yy]* ) sudo ./install_dependencies.sh; break;; [Yy]* ) ./linux_install.sh; break;;
[Nn]* ) break;; [Nn]* ) break;;
* ) echo "Invalid answer";; * ) echo "Invalid answer";;
esac esac
done done
echo "Installing dependencies needed for the installation (unzip, wget)"
echo "This will ask for the sudo password"
sudo apt-get install unzip wget
download_dir=wsl_downloaded download_dir=wsl_downloaded
source "$dir/win_shared_install.sh" source "$dir/win_shared_install.sh"