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

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 5da64b1d0..d11c78ac7 100644
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -28,12 +28,30 @@ 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"
 
+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 +62,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 +76,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 +91,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