summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/msys2_install.sh8
-rw-r--r--util/win_shared_install.sh44
-rw-r--r--util/wsl_install.sh45
3 files changed, 52 insertions, 45 deletions
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 945009e5e8..ac21b3cad2 100644
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -1,4 +1,10 @@
#!/bin/bash
dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-source "$dir/win_shared_install.sh" \ No newline at end of file
+source "$dir/win_shared_install.sh"
+
+echo
+echo "******************************************************************************"
+echo "Installation completed!"
+echo "You need to open a new batch command prompt for all the utils to work properly"
+echo "******************************************************************************" \ No newline at end of file
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index 78346284a9..c30e28796b 100644
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -89,50 +89,6 @@ 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
diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 578fcb88cc..5da64b1d0a 100644
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -30,4 +30,49 @@ echo "This will ask for the sudo password"
sudo apt-get install unzip wget
source "$dir/win_shared_install.sh"
+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