From 6cb47341ae52f98b6f790f934d6370edb0269d71 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@listia.com>
Date: Tue, 25 Sep 2018 22:17:32 +0800
Subject: [PATCH 1/4] upgrade ruby version

---
 mac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mac b/mac
index ad77621a7..1949e7eb2 100644
--- a/mac
+++ b/mac
@@ -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

From 11889adea215027b0b23082dbd7d9101e1242fcb Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@listia.com>
Date: Tue, 25 Sep 2018 22:17:54 +0800
Subject: [PATCH 2/4] remove anvil

---
 mac | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mac b/mac
index 1949e7eb2..22ae1493c 100644
--- a/mac
+++ b/mac
@@ -309,22 +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

From 0d0ce762ea8da163dcd3046c06dbebdf3eb1c365 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@listia.com>
Date: Tue, 25 Sep 2018 22:18:25 +0800
Subject: [PATCH 3/4] remove hi-chat

---
 mac | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/mac b/mac
index 22ae1493c..da6ac6e24 100644
--- a/mac
+++ b/mac
@@ -309,17 +309,6 @@ fancy_echo "Configuring Bundler for faster, parallel gem installation ..."
 fi
 ### end mac-components/bundler
 
-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

From b57280f7e4f052b3c9b6cc26c775c8afd0078fc7 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@listia.com>
Date: Wed, 26 Sep 2018 16:24:53 +0800
Subject: [PATCH 4/4] Specify mysql version

---
 mac-components/mysql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mac-components/mysql b/mac-components/mysql
index 32301f50b..9ae37012d 100644
--- a/mac-components/mysql
+++ b/mac-components/mysql
@@ -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