Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hipchat and upgrade ruby #9

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions mac
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ fancy_para
### end mac-components/compiler-and-libraries

if ( echo "common-components/ruby-environment" | grep -q "$PACKAGE" ); then
ruby_version="ruby-2.0.0-p645"
ruby_version="ruby-2.2.6"

fancy_echo "Installing Ruby $ruby_version ..."
if [ -n "$(rvm list | grep "$ruby_version")" ]; then
Expand Down Expand Up @@ -309,33 +309,6 @@ fancy_echo "Configuring Bundler for faster, parallel gem installation ..."
fi
### end mac-components/bundler

if ( echo "mac-components/anvil" | grep -q "$PACKAGE" ); then
fancy_echo "Installing Anvil..."
if [ ! -d "/Applications/Anvil.app" ]; then
wget http://sparkler.herokuapp.com/apps/3/download -O /tmp/Anvil.app.zip

#if [ "$(md5 -r /tmp/Anvil.app.zip)" == "d41d8cd98f00b204e9800998ecf8427e" ]; then
echo "Enter your password to install Anvil into /Applications "
sudo unzip -o /tmp/Anvil.app.zip -d /Applications/
#rm -f /tmp/Anvil.app.zip
#fi
else
fancy_echo "Ignore"
fi
fi
### end mac-components/anvil

if ( echo "mac-components/hipchat" | grep -q "$PACKAGE" ); then
fancy_echo "Installing Hipchat..."
if [ ! -d "/Applications/HipChat.app" ]; then
brew cask install hipchat
fancy_echo "*** Done"
else
fancy_echo "*** Installed. Ignore"
fi
fi
### end mac-components/hipchat

if ( echo "mac-components/imageoptim" | grep -q "$PACKAGE" ); then
fancy_echo "Installing ImageOptim..."
if [ ! -d "/Applications/ImageOptim.app" ]; then
Expand Down
2 changes: 1 addition & 1 deletion mac-components/mysql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fancy_echo "Installing MySQL 5.7 ..."
fancy_echo "Updating brew formula..."

brew_install_or_upgrade mysql
brew_install_or_upgrade mysql@5.7
brew link mysql --force >> /tmp/laptop.log 2>&1
brew services start mysql

Expand Down