X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fwsl_install.sh;h=d11c78ac716529342e17c904da5795d4ae1a65b1;hb=685d4c2f9754e22de3b68379cfc959197495c0aa;hp=314f520b95064327f40c886dd46b35a06738975b;hpb=b8899b48b45c0209e44cc35d9185aa670e769d40;p=qmk_firmware.git

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 314f520b9..d11c78ac7 100644
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -1,45 +1,7 @@
 #!/bin/bash
 
-download_dir=wsl_downloaded
-
-function install_utils {
-    rm -f -r $download_dir
-    mkdir $download_dir
-
-    pushd $download_dir
-
-    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
-
-    echo "Installing teensy_loader_cli"
-    wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip'
-    7z x teensy_loader_cli_windows.zip
-
-    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
-
-    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 -
-
-    rm -f *.zip
-    rm Flip\ Installer\ -\ 3.4.7.112.exe
-
-    popd > /dev/null
-}
-
-function install_drivers {
-    pushd $download_dir
-    cmd.exe /C qmk_driver_installer.exe $1 $2 ../drivers.txt
-    popd > /dev/null
-}
-
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
+pushd "$dir";
 
 if [[ $dir != /mnt/* ]];
 then
@@ -49,7 +11,6 @@ then
     exit 1
 fi
 
-pushd "$dir"
 
 while true; do
     echo
@@ -64,19 +25,49 @@ while true; do
     esac
 done
 
-echo "Installing dependencies needed for the installation (p7zip-full, wget)"
+echo "Installing dependencies needed for the installation (unzip, wget)"
 echo "This will ask for the sudo password"
-sudo apt-get install p7zip-full wget
+sudo apt-get install unzip wget
+
+download_dir=wsl_downloaded
 
+source "$dir/win_shared_install.sh"
 
-if [ ! -d "$download_dir" ]; then
-    install_utils
+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
-        read -p "The utils seem to already be downloaded, do you want to re-download them and update to the newest version (Y/N) " res
+        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]* ) install_utils; break;;
+            [Yy]* ) echo "source ~/qmk_utils/activate_wsl.sh" >> ~/.bashrc; break;;
             [Nn]* ) break;;
             * ) echo "Invalid answer";;
         esac
@@ -85,26 +76,22 @@ fi
 
 while true; do
     echo
-    echo "Which USB drivers do you want to install?"
-    echo "(A)all - All supported drivers will be installed"
-    echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode) will be installed"
-    echo "(F)force - Like all, but will also override existing drivers for connected keyboards"
-    echo "(N)one - No drivers will be installed, flashing your keyboard will most likely not work"
-    read -p "(A/C/F/N)? " res
+    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
-        [Aa]* ) install_drivers --all; break;;
-        [Cc]* ) install_drivers; break;;
-        [Ff]* ) install_drivers --all --force; break;;
+        [Yy]* ) ln -sfn "$dir/.." ~/qmk_firmware; break;;
         [Nn]* ) break;;
         * ) echo "Invalid answer";;
     esac
 done
 
-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)"
-ln -sf "$dir" ~/qmk_utils
+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
-