From d6ae55076b138b49cadaa789ea76de167a03ad31 Mon Sep 17 00:00:00 2001 From: Newton Date: Tue, 22 Jul 2014 19:59:44 -0700 Subject: [PATCH] Update install script Remove dependency on Brewfile as it appears that Homebrew is deprecating it.[1][1],[2][2] [1]: https://github.com/Homebrew/homebrew/issues/30815 [2]: https://github.com/Homebrew/homebrew/pull/30749 --- install | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/install b/install index e35c9c9..94ea95c 100755 --- a/install +++ b/install @@ -122,10 +122,8 @@ git submodule update --recursive --init --quiet # Create variable directory, but only after base installation is complete mkdir -p ${DIR}/var -# set variable for Brewfile based on directory -BREWFILE="${DIR}/var/Brewfile" -# Install Homebrew formulae via Brewfile +# Install Homebrew formulae if ! type -P 'brew' &> /dev/null; then _error "Homebrew not found" else @@ -135,9 +133,9 @@ else brews="${DIR}/opt/homebrew" # Update and upgrade all packages - echo "update" >> ${BREWFILE} - echo "upgrade" >> ${BREWFILE} - echo "tap homebrew/completions" >> ${BREWFILE} + brew update + brew upgrade + brew tap homebrew/completions # Store IFS within a temp variable OIFS=$IFS @@ -153,7 +151,7 @@ else # Test whether a Homebrew formula is already installed if ! brew list '${formulae[$index]}' &> /dev/null; then # Add to brewfile to install - echo "install ${formulae[$index]}" >> ${BREWFILE} + brew install ${formulae[$index]} fi done @@ -161,17 +159,11 @@ else IFS=$OIFS # Tap some necessary formulae - echo "tap homebrew/dupes" >> ${BREWFILE} - echo "tap homebrew/versions" >> ${BREWFILE} - echo "tap homebrew/homebrew-php" >> ${BREWFILE} - echo "install php55" >> ${BREWFILE} - echo "cleanup" >> ${BREWFILE} - - # Install using bundle command - brew bundle "${BREWFILE}" - - # Set up hash file for brew installation - echo $(md5 "${brews}" | cut -d ' ' -f 4) > "${DIR}/var/homebrew" + brew tap homebrew/dupes + brew tap homebrew/versions + brew tap homebrew/homebrew-php + brew install php55 + brew cleanup [[ $? ]] && _success "Installed all Homebrew packages" fi