X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fmsys2_install.sh;h=de03b89ac40d48eb97ac6a2f7a08e10d57989445;hb=30dc34d5294a03d5f58dadf9745d68a271d443f8;hp=866cc25a7c7060140c1e1966c7ee7bf97b43bf7a;hpb=0d9e7f635e8f05356101d72725342fc272b7b71b;p=qmk_firmware.git

diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 866cc25a7..de03b89ac 100644
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -7,7 +7,7 @@ armtools=gcc-arm-none-eabi
 installflip=false
 
 echo "Installing dependencies needed for the installation (quazip)"
-pacman --needed -S msys/unzip msys/p7zip
+pacman --needed -S msys/unzip msys/p7zip base-devel msys/git mingw-w64-x86_64-toolchain
 
 source "$dir/win_shared_install.sh"
 
@@ -88,8 +88,30 @@ else
 fi
 popd
 
+cp -f "$dir/activate_msys2.sh" "$download_dir/"
+
+if grep "^source ~/qmk_utils/activate_msys2.sh$" ~/.bashrc
+then
+    echo
+    echo "The line source ~/qmk_utils/activate_msys2.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_msys2.sh' to the end of your"
+        echo ".bashrc file? Without this make won't find the needed utils, so if you don't"
+        echo "want to do it automatically, then you have to do it manually later."
+        read -p "(Y/N)? " res
+        case $res in
+            [Yy]* ) echo "source ~/qmk_utils/activate_msys2.sh" >> ~/.bashrc; break;;
+            [Nn]* ) break;;
+            * ) echo "Invalid answer";;
+        esac
+    done
+fi
+
 echo
 echo "******************************************************************************"
 echo "Installation completed!"
-echo "You need to open a new batch command prompt for all the utils to work properly"
+echo "Please close this Window and restart MSYS2 MinGW"
 echo "******************************************************************************"
\ No newline at end of file