Clean macos install script (#7186)

This commit is contained in:
Yadunand Prem 2019-10-29 09:13:07 +11:00 committed by Joel Challis
parent 6d7c6d4fd6
commit 917ab71c52

View File

@ -2,20 +2,20 @@
util_dir=$(dirname "$0") util_dir=$(dirname "$0")
if ! brew --version 2>&1 > /dev/null; then if ! brew --version >/dev/null 2>&1; then
echo "Error! Homebrew not installed or broken!" echo "Error! Homebrew not installed or broken!"
echo -n "Would you like to install homebrew now? [y/n] " echo -n "Would you like to install homebrew now? [y/n] "
while read ANSWER; do while read -r ANSWER; do
case $ANSWER in case $ANSWER in
y|Y) y | Y)
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
break break
;; ;;
n|N) n | N)
exit 1 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 done
@ -26,4 +26,4 @@ brew tap PX4/homebrew-px4
brew update brew update
brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3 brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3
brew link --force avr-gcc@8 brew link --force avr-gcc@8
pip3 install -r ${util_dir}/../requirements.txt pip3 install -r "${util_dir}/../requirements.txt"