Skip to content

Commit

Permalink
Issue/122/brew dependency updates (#123)
Browse files Browse the repository at this point in the history
* Update brew php formulae from 7.4 to 8.0, remove bash-completion.

* No longer install bash-completion on OSX, link PHP8.0, upgrade NVM to 0.39.1
  • Loading branch information
defunctl authored Jun 7, 2022
1 parent 37f0c89 commit 9f480de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions brew/packages.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
bash-completion@2
composer
coreutils
curl
docker-credential-helper
git
php@7.4
php@8.0
7 changes: 3 additions & 4 deletions install/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PHAR_NAME="so.phar"
CONFIG_DIR=~/.config/squareone
BIN_NAME="so"
DC_VERSION="1.29.2"
NVM_VERSION="0.38.0"
NVM_VERSION="0.39.1"
AUTOCOMPLETE_BASH="squareone.autocompletion"
AUTOCOMPLETE_ZSH="squareone_completion.zsh"
AUTOCOMPLETE_FISH="so.fish"
Expand Down Expand Up @@ -43,7 +43,6 @@ install_homebrew() {

enable_autocomplete() {
if [[ "$OSTYPE" == "darwin"* ]]; then
sudo curl -fsSL 'https://raw.githubusercontent.com/moderntribe/square1-global-docker/master/squareone.autocompletion' -o "$(brew --prefix)/etc/bash_completion.d/${AUTOCOMPLETE_BASH}"
curl -fsSL 'https://raw.githubusercontent.com/moderntribe/square1-global-docker/master/squareone.autocompletion.zsh' -o ~/."${AUTOCOMPLETE_ZSH}" && echo "source ~/.${AUTOCOMPLETE_ZSH}" >> ~/.zshrc
else
sudo curl -fsSL 'https://raw.githubusercontent.com/moderntribe/square1-global-docker/master/squareone.autocompletion' -o /etc/bash_completion.d/"${AUTOCOMPLETE_BASH}"
Expand Down Expand Up @@ -123,8 +122,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
echo "* Installing dependencies via brew..."
curl -fsSL https://raw.githubusercontent.com/moderntribe/square1-global-docker/master/brew/packages.txt -o "${CONFIG_DIR}/packages.txt"
brew install "$(<${CONFIG_DIR}/packages.txt)"
echo "* Setting the default PHP version to 7.4..."
brew link php@7.4 --force
echo "* Setting the default PHP version to 8.0..."
brew link php@8.0 --force
fi

# Debian Linux flavors including WSL2
Expand Down

0 comments on commit 9f480de

Please sign in to comment.