Add activate_wsl to .bashrc

diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh
index afff5addccc85db55df5fb84ba844fe716af8272..e2312b56d48797acfaa35e99c0d46bbc784829d0 100644 (file)
--- 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 bb2df1b4da8838e1041d07d8b18b3364c84fd8f0..f863c182e0b27ac1df236d3118fd3ebebe01b84e 100644 (file)
--- 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!"