From 80e17f14fd5291941a0eb47b05b8b70af821d57b Mon Sep 17 00:00:00 2001 From: thatcomputerguy0101 Date: Fri, 8 Sep 2023 16:45:31 -0400 Subject: [PATCH] build: Fix errors in MacOS dev-install script The new install script had a few errors since I had installed the packages directly, and several of the packages underwent name changes since I originally wrote it. Signed-off-by: Alan Everett --- scripts/dev-install-macos.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/dev-install-macos.sh b/scripts/dev-install-macos.sh index 8637ee118e5f..beab1f0f30c6 100644 --- a/scripts/dev-install-macos.sh +++ b/scripts/dev-install-macos.sh @@ -4,15 +4,18 @@ install_packages() { PKGLIST="" - TAPLIST="osx-cross/avr osx-cross/arm" + TAPLIST="osx-cross/homebrew-avr osx-cross/homebrew-arm" # AVR chip installation and building PKGLIST="${PKGLIST} avrdude avr-gcc" # ARM chip installation and building - PKGLIST="${PKGLIST} stm32flash wxmac arm-gcc-bin" + PKGLIST="${PKGLIST} stm32flash wxwidgets arm-gcc-bin" # Tap necessary package repos report_status "Tapping formula repositories..." - brew tap ${TAPLIST} + for TAP in $TAPLIST + do + brew tap $TAP + done brew update # Install desired packages @@ -20,6 +23,12 @@ install_packages() brew install ${PKGLIST} } +# Helper functions +report_status() +{ + echo -e "\n\n###### $1" +} + verify_ready() { if [ "$EUID" -eq 0 ]; then