X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fwsl_install.sh;h=197d9f089ef5e1be20e2426eb9ef9861052675d9;hb=d686c0ea43d6a9db7768da64ee54c3ba25c018f7;hp=87aad77272d4f0fe44622bad7e0d81a85de88c41;hpb=28a4e90565f5ea986401dbd69d74a5a4cc16abab;p=qmk_firmware.git

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
old mode 100644
new mode 100755
index 87aad7727..197d9f089
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -1,33 +1,95 @@
 #!/bin/bash
 
-rm -f -r wsl_downloaded
-mkdir wsl_downloaded
-pushd wsl_downloaded
+util_dir=$(dirname "$0")
+dir=$(cd -P -- "$util_dir" && pwd -P)
+pushd "$dir";
 
-echo "Installing dependencies (7z-full, wget)"
-echo "This will ask for the sudo password"
-sudo apt-get install 7z-full wget
+if [[ $dir != /mnt/* ]];
+then
+    echo
+    echo "You need to clone the qmk_firmware repository outside the linux filesystem."
+    echo "Otherwise the windows executables can't be run."
+    exit 1
+fi
 
-echo "Installing dfu-programmer"
-wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip'
-7z x -odfu-programmer dfu-programmer-win-0.7.2.zip
 
-echo "Installing dfu-util"
-wget 'http://dfu-util.sourceforge.net/releases/dfu-util-0.9-win64.zip'
-7z x dfu-util-0.9-win64.zip
+while true; do
+    echo
+    echo "Do you want to install all toolchain dependencies needed for compiling QMK?"
+    echo "If you don't want that, you can install the dependencies manually."
+    read -p "(Y/N) " res
+    case $res in
+        [Yy]* ) ./linux_install.sh; break;;
+        [Nn]* ) break;;
+        * ) echo "Invalid answer";;
+    esac
+done
 
-echo "Installing teensy_loader_cli"
-wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip'
-7z x teensy_loader_cli_windows.zip
+download_dir=wsl_downloaded
 
-echo "Installing Atmel Flip"
-wget 'http://www.atmel.com/images/Flip%20Installer%20-%203.4.7.112.exe'
-7z x -oFlip Flip\ Installer\ -\ 3.4.7.112.exe
+source "$dir/win_shared_install.sh"
 
-echo "Downloading the QMK driver installer"
-wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i -
+pip3 install -r ${util_dir}/../requirements.txt
 
-rm -f *.zip
-rm Flip\ Installer\ -\ 3.4.7.112.exe
+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 enter to continue (ctrl-c to abort)"
+ln -sfn "$dir" ~/qmk_utils
+
+if grep "^source ~/qmk_utils/activate_wsl.sh$" ~/.bashrc
+then
+    echo
+    echo "The line source ~/qmk_utils/activate_wsl.sh is already added to your /.bashrc"
+    echo "Not adding it twice"
+else
+    while true; do
+        echo
+        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;;
+            [Nn]* ) break;;
+            * ) echo "Invalid answer";;
+        esac
+    done
+fi
+
+while true; do
+    echo
+    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;;
+        [Nn]* ) break;;
+        * ) echo "Invalid answer";;
+    esac
+done
+
+echo
+echo "******************************************************************************"
+echo "Installation completed!"
+echo "You need to open a new bash command prompt for all the utils to work properly"
+echo "******************************************************************************"
+
+popd > /dev/null