X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fmsys2_install.sh;h=d9459580c7dd6244467883ff121df5e3c2e68830;hb=34112dac36482edbd5331eac3dfe436752ff7653;hp=1b99806b5ef0b0ca2330ffe354ae64a68e2f4b1e;hpb=b8c363099b76db8b017333ffbbb7630f5c21b1dd;p=qmk_firmware.git

diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 1b99806b5..d9459580c 100644
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -3,23 +3,40 @@
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 download_dir=~/qmk_utils
 avrtools=avr8-gnu-toolchain
+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 {
+    wget -O gcc-arm-none-eabi.zip "https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-win32.zip?product=GNU%20ARM%20Embedded%20Toolchain,ZIP,,Windows,6-2017-q2-update"
+    unzip -d gcc-arm-none-eabi gcc-arm-none-eabi.zip
+    rm gcc-arm-none-eabi.zip
+}
+
+function extract_flip {
+    rm -f -r flip
+    7z -oflip x FlipInstaller.exe
 }
 
 pushd "$download_dir"
 
+if [ -f "FlipInstaller.exe" ]; then
+    echo
+    echo "Extracting flip"
+    extract_flip
+fi
 
 if [ ! -d "$avrtools" ]; then
     while true; do
@@ -45,10 +62,57 @@ else
         esac
     done
 fi
+
+if [ ! -d "$armtools" ]; then
+    while true; do
+        echo
+        echo "The ARM toolchain is not installed."
+        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;;
+            [Nn]* ) break;;
+            * ) echo "Invalid answer";;
+        esac
+    done
+else
+    while true; do
+        echo
+        echo "The ARM toolchain is already installed"
+        read -p "Do you want to reinstall? (Y/N) " res
+        case $res in
+            [Yy]* ) install_arm; break;;
+            [Nn]* ) break;;
+            * ) echo "Invalid answer";;
+        esac
+    done
+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 "******************************************************************************"