diff --git a/install-packages.sh b/install-packages.sh deleted file mode 100644 index 52b983e..0000000 --- a/install-packages.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Check for Homebrew, install if it does not exist - echo "Looking for Homebrew..." - if test ! $(which brew); then - echo "Installing homebrew..." - sh -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - else - echo "Homebrew Installed โœ…" - - echo "Installing packages..." - brew install ${PACKAGES[@]} - echo "Packages installed ๐Ÿ“ฆ" - - echo "Cleaning up ๐Ÿงน" - brew cleanup - fi diff --git a/install.sh b/install.sh index 35d0285..ff142cf 100644 --- a/install.sh +++ b/install.sh @@ -8,6 +8,21 @@ InstallCore () { # Install Brew and zurg Brew packages sh install-packages.sh + # Check for Homebrew, install if it does not exist + echo "Looking for Homebrew..." + if test ! $(which brew); then + echo "Installing homebrew..." + sh -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" + fi + echo "Homebrew Installed โœ…" + + echo "Installing and upgrading packages..." + brew install ${PACKAGES[@]} + echo "Packages installed ๐Ÿ“ฆ" + + echo "Cleaning up ๐Ÿงน" + brew cleanup + # Moving .zprofile to home directory. This points default zsh to use zurg instead. cp ${HOME}/zurg-cli/.zprofile ${HOME}