summaryrefslogtreecommitdiff
path: root/util/macos_install.sh
diff options
context:
space:
mode:
authorWilliam Chang <william@factual.com>2019-11-20 22:17:07 -0800
committerWilliam Chang <william@factual.com>2019-11-20 22:17:07 -0800
commite7f4d56592b3975c38af329e77b4efd9108495e8 (patch)
tree0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /util/macos_install.sh
parent71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff)
parent8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util/macos_install.sh')
-rwxr-xr-xutil/macos_install.sh25
1 files changed, 14 insertions, 11 deletions
diff --git a/util/macos_install.sh b/util/macos_install.sh
index 915ff3143c..f993003f09 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -1,26 +1,29 @@
#!/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
done
fi
brew tap osx-cross/avr
-brew tap PX4/homebrew-px4
+brew tap osx-cross/arm
brew update
-brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
+brew install avr-gcc@8 arm-gcc-bin dfu-programmer avrdude clang-format dfu-util python3
brew link --force avr-gcc@8
+pip3 install -r "${util_dir}/../requirements.txt"