summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-05-28 21:28:18 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-05-28 21:30:55 +0300
commitec720ac1ea63b3afa2988be06b221d2ed10a2af9 (patch)
treea5dcc858cda21e4f8545aa38f8233b6df9f75b0c
parentfa4a492677d1435637dceee03302e1bdbd579a2d (diff)
Add activate_wsl to .bashrc
-rw-r--r--util/activate_wsl.sh17
-rw-r--r--util/wsl_install.sh20
2 files changed, 31 insertions, 6 deletions
diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh
index afff5addcc..e2312b56d4 100644
--- a/util/activate_wsl.sh
+++ b/util/activate_wsl.sh
@@ -1,12 +1,17 @@
#!/bin/bash
-util_dir=~/qmk_utils
-download_dir=$util_dir/wsl_downloaded
+function export_variables {
+ local util_dir=~/qmk_utils
+ local download_dir=$util_dir/wsl_downloaded
+
+ export DFU_PROGRAMMER=$download_dir/dfu-programmer/dfu-programmer.exe
+ export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe
+ export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
+ export BATCHISP=batchisp.exe
+}
+
+export_variables
-export DFU_PROGRAMMER=$download_dir/dfu-programmer/dfu-programmer.exe
-export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe
-export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe
-export BATCHISP=batchisp.exe
diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index bb2df1b4da..f863c182e0 100644
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -116,6 +116,26 @@ 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
+
echo
echo "******************************************************************************"
echo "Installation completed!"