Software backlight improvements (#7255)

[qmk_firmware.git] / util / macos_install.sh

diff --git a/util/macos_install.sh b/util/macos_install.sh
index 551b84b5aa3a2d3bb49ca9e1277caad469f0d7a8..a4037cce9ee939fb5628577a28c4fd392b15e24f 100755 (executable)
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -1,25 +1,32 @@
 #!/bin/bash
 
-if brew --version 2>&1 > /dev/null; then
+util_dir=$(dirname "$0")
+
+if ! brew --version >/dev/null 2>&1; then
        echo "Error! Homebrew not installed or broken!"
        echo -n "Would you like to install homebrew now? [y/n] "
-       while read ANSWER; do
+       while read -r ANSWER; do
                case $ANSWER in
-                       y|Y)
-                               /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-                               break
+               y | Y)
+                       /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+                       break
                        ;;
-                       n|N)
-                               exit 1
+               n | N)
+                       exit 1
                        ;;
-                       *)
-                               echo -n "Would you like to install homebrew now? [y/n] "
+               *)
+                       echo -n "Would you like to install homebrew now? [y/n] "
                        ;;
-                esac
+               esac
        done
 fi
 
 brew tap osx-cross/avr
-brew tap PX4/homebrew-px4
+brew tap osx-cross/arm
 brew update
-brew install avr-gcc gcc-arm-none-eabi dfu-programmer avrdude
+brew install avr-gcc@8 arm-gcc-bin@8 dfu-programmer avrdude clang-format dfu-util python3
+brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
+brew link --force avr-gcc@8
+brew link --force arm-gcc-bin@8
+
+pip3 install -r "${util_dir}/../requirements.txt"