Skip to content
This repository has been archived by the owner on Jun 15, 2022. It is now read-only.

Commit

Permalink
Merge pull request #51 from cwonrails/master
Browse files Browse the repository at this point in the history
Prune phantomjs lines - install bug has been fixed
  • Loading branch information
monfresh committed Feb 21, 2016
2 parents 312a767 + e2c2436 commit e8cd6bf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ What it sets up
* [ImageMagick] for cropping and resizing images
* [MySQL] for storing relational data
* [n] for managing Node.js versions if you do not have [Node.js] already installed (Includes latest [Node.js] and [NPM], for running apps and installing JavaScript packages)
* [PhantomJS] for headless website testing (unless on El Capitan, due to [this bug](https://github.com/Homebrew/homebrew/issues/42249))
* [PhantomJS] for headless website testing
* [Postgres] for storing relational data
* [pyenv] for managing Python versions if you do not have [Python] already installed (includes the latest 3.x [Python])
* [Redis] for storing key-value data
Expand Down
6 changes: 1 addition & 5 deletions mac
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,7 @@ brew services restart redis

brew_install_or_upgrade 'imagemagick'

# PhantomJS doesn't support El Capitan yet
# https://github.com/Homebrew/homebrew/issues/42249
if ! sw_vers -productVersion | grep -q "^10\.11"; then
brew_install_or_upgrade 'phantomjs'
fi
brew_install_or_upgrade 'phantomjs'

brew_install_or_upgrade 'hub'
# shellcheck disable=SC2016
Expand Down

0 comments on commit e8cd6bf

Please sign in to comment.