X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fwsl_install.sh;h=197d9f089ef5e1be20e2426eb9ef9861052675d9;hb=d686c0ea43d6a9db7768da64ee54c3ba25c018f7;hp=5da64b1d0a2983713f70b892ccfc990ae6e5131f;hpb=861087096bf4308b0fa4608ca66173e4eb6f5b76;p=qmk_firmware.git

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
old mode 100644
new mode 100755
index 5da64b1d0..197d9f089
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
+util_dir=$(dirname "$0")
+dir=$(cd -P -- "$util_dir" && pwd -P)
 pushd "$dir";
 
 if [[ $dir != /mnt/* ]];
@@ -15,25 +16,40 @@ 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"
 
+pip3 install -r ${util_dir}/../requirements.txt
+
+pushd "$download_dir"
+while true; do
+    echo
+    echo "Flip need to be installed if you want to use that for programming."
+    echo "Please install it to the default location!"
+    read -p "Do you want to install it now? (Y/N) " res
+    case $res in
+        [Yy]* ) cmd.exe /c FlipInstaller.exe; break;;
+        [Nn]* ) break;;
+        * ) echo "Invalid answer";;
+    esac
+done
+popd
+
+
 echo 
 echo "Creating a softlink to the utils directory as ~/qmk_utils."
 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)"
+read -p "Press enter to continue (ctrl-c to abort)"
 ln -sfn "$dir" ~/qmk_utils
 
 if grep "^source ~/qmk_utils/activate_wsl.sh$" ~/.bashrc
@@ -44,9 +60,9 @@ then
 else
     while true; do
         echo
-        echo "Do you want to add 'source ~/qmk_utils/activate_wsl.sh' to the end of you .bashrc file?"
-        echo "Without this make won't find the needed utils, so if you don't want to do it automatically,"
-        echo "then you have to do it manually."
+        echo "Do you want to add 'source ~/qmk_utils/activate_wsl.sh' to the end of your"
+        echo ".bashrc file? Without this make won't find the needed utils, so if you don't"
+        echo "want to do it automatically, then you have to do it manually later."
         read -p "(Y/N)? " res
         case $res in
             [Yy]* ) echo "source ~/qmk_utils/activate_wsl.sh" >> ~/.bashrc; break;;
@@ -58,9 +74,10 @@ fi
 
 while true; do
     echo
-    echo "Do you want to add a symlink to the QMK repository in your home directory for convenience?"
-    echo "This will create a folder 'qmk_firmware' in your home directory."
-    echo "In the future you can use this folder instead of the full path on your windows file system"
+    echo "Do you want to add a symlink to the QMK repository in your home directory for"
+    echo "convenience? This will create a folder 'qmk_firmware' in your home directory."
+    echo "In the future you can use this folder instead of the full path on your Windows"
+    echo "file system."
     read -p "(Y/N)? " res
     case $res in
         [Yy]* ) ln -sfn "$dir/.." ~/qmk_firmware; break;;
@@ -72,7 +89,7 @@ done
 echo
 echo "******************************************************************************"
 echo "Installation completed!"
-echo "You need to open a new batch command prompt for all the utils to work properly"
+echo "You need to open a new bash command prompt for all the utils to work properly"
 echo "******************************************************************************"
 
 popd > /dev/null