Added gentoo to installer (#3272)

[qmk_firmware.git] / util / msys2_install.sh

diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 866cc25a7c7060140c1e1966c7ee7bf97b43bf7a..d9459580c7dd6244467883ff121df5e3c2e68830 100644 (file)
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -7,15 +7,16 @@ 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"
 
 function install_avr {
     rm -f -r "$avrtools"
-    wget "http://www.atmel.com/images/avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe"
+    wget "http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe"
     7z x avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe
     rm avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe
+    pacman --needed -S mingw-w64-x86_64-avrdude
 }
 
 function install_arm {
@@ -66,7 +67,7 @@ if [ ! -d "$armtools" ]; then
     while true; do
         echo
         echo "The ARM toolchain is not installed."
-        echo "This is needed for building ARM based keboards."
+        echo "This is needed for building ARM based keyboards."
         read -p "Do you want to install it? (Y/N) " res
         case $res in
             [Yy]* ) install_arm; break;;
@@ -88,8 +89,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 "******************************************************************************"
\ No newline at end of file
+echo "Please close this Window and restart MSYS2 MinGW"
+echo "******************************************************************************"