From 11c4c711310d297a378f029b7ffa1409d5a04dbc Mon Sep 17 00:00:00 2001
From: skullY <skullydazed@gmail.com>
Date: Tue, 9 Oct 2018 11:35:31 -0700
Subject: Fixup the WSL install
---
util/win_shared_install.sh | 3 ---
util/wsl_install.sh | 7 +------
2 files changed, 1 insertion(+), 9 deletions(-)
(limited to 'util')
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 {
wget 'https://www.pjrc.com/teensy/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"
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
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
while true; do
echo
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."
read -p "(Y/N) " res
case $res in
- [Yy]* ) sudo ./install_dependencies.sh; break;;
+ [Yy]* ) ./linux_install.sh; break;;
[Nn]* ) break;;
* ) echo "Invalid answer";;
esac
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
source "$dir/win_shared_install.sh"
--
cgit v1.2.3