X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fwsl_install.sh;h=c2c206d2b90e72aa21823e535101577ce842f511;hb=e4b91cffea3a36799abf8017a8b0c303c53a3d23;hp=1574803534b2030eb024e2b68977604a4e95559a;hpb=5412229603c1b16051776e81bed57697adf339e2;p=qmk_firmware.git diff --git a/util/wsl_install.sh b/util/wsl_install.sh old mode 100644 new mode 100755 index 157480353..c2c206d2b --- a/util/wsl_install.sh +++ b/util/wsl_install.sh @@ -15,20 +15,15 @@ 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" @@ -51,7 +46,7 @@ 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 @@ -91,7 +86,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