Remove OLED code and set I2C rate back to 100kHz

[qmk_firmware.git] / util / wsl_install.sh

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index f9c7f609064de80f6e1f431360e1b6f422dcc7da..8999da8a46209f5d62ebdec867559f3f03d1d3fa 100644 (file)
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -10,40 +10,34 @@ function install_utils {
 
     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
+    unzip -d dfu-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
+    unzip 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
+    unzip 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
+    mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.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
-    cp ../drivers.txt .
     cmd.exe /C qmk_driver_installer.exe $1 $2 ../drivers.txt
     popd > /dev/null
 }
 
-echo "Installing dependencies (p7zip-full, wget)"
-echo "This will ask for the sudo password"
-sudo apt-get install p7zip-full wget
-
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 
 if [[ $dir != /mnt/* ]];
@@ -56,6 +50,24 @@ fi
 
 pushd "$dir"
 
+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;;
+        [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
+
+
 if [ ! -d "$download_dir" ]; then
     install_utils
 else
@@ -70,6 +82,17 @@ else
     done
 fi
 
+while true; do
+    echo
+    read -p "Flip need to be installed if you want to use that for programming, do you want to install it now? (Y/N) " res
+    case $res in
+        [Yy]* ) cmd.exe /c $download_dir\\FlipInstaller.exe; break;;
+        [Nn]* ) break;;
+        * ) echo "Invalid answer";;
+    esac
+done
+
+
 while true; do
     echo
     echo "Which USB drivers do you want to install?"
@@ -87,5 +110,50 @@ while true; do
     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 -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 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."
+        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 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"
+    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 batch command prompt for all the utils to work properly"
+echo "******************************************************************************"
+
 popd > /dev/null