Clean macos install script (#7186) 0.7.50
authorYadunand Prem <yadunut@gmail.com>
Mon, 28 Oct 2019 22:13:07 +0000 (09:13 +1100)
committerJoel Challis <git@zvecr.com>
Mon, 28 Oct 2019 22:13:07 +0000 (22:13 +0000)
util/macos_install.sh

index d9ec50a..c5c27d1 100755 (executable)
@@ -2,20 +2,20 @@
 
 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 -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
@@ -26,4 +26,4 @@ brew tap PX4/homebrew-px4
 brew update
 brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3
 brew link --force avr-gcc@8
-pip3 install -r ${util_dir}/../requirements.txt
+pip3 install -r "${util_dir}/../requirements.txt"