From 93123e447bbfcaa291de81cb95bf01e3d6aba8dc Mon Sep 17 00:00:00 2001
From: Jeff Morgan <jmorganca@gmail.com>
Date: Wed, 10 Sep 2014 23:17:19 -0700
Subject: [PATCH] Specific verison of boot2docker

---
 .gitignore                       |  2 +-
 meteor/client/lib/boot2docker.js |  2 +-
 script/setup.sh                  | 15 +++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0e27e27dc..293db15e3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ bin
 resources/cache
 resources/base-images.tar.gz
 resources/virtualbox-*.pkg
-resources/boot2docker
+resources/boot2docker*
 resources/node-webkit
 resources/mongod
 resources/MONGOD_LICENSE.txt
diff --git a/meteor/client/lib/boot2docker.js b/meteor/client/lib/boot2docker.js
index 9992e8decd..a98369e0fc 100644
--- a/meteor/client/lib/boot2docker.js
+++ b/meteor/client/lib/boot2docker.js
@@ -7,7 +7,7 @@ Boot2Docker = {};
 Boot2Docker.REQUIRED_IP = '192.168.60.103';
 
 Boot2Docker.command = function () {
-  return path.join(Util.getBinDir(), 'boot2docker') + ' --vm="kitematic-vm"';
+  return path.join(Util.getBinDir(), 'boot2docker-1.2.0') + ' --vm="kitematic-vm"';
 };
 
 Boot2Docker.exec = function (command, callback) {
diff --git a/script/setup.sh b/script/setup.sh
index f93730f3a0..6808d9023e 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -19,17 +19,12 @@ ATOM_SHELL_VERSION=0.16.2
 ATOM_SHELL_FILE=atom-shell-v$ATOM_SHELL_VERSION-darwin-x64.zip
 
 if [ ! -f $ATOM_SHELL_FILE ]; then
-  cecho "-----> Downloading Boot2docker CLI..." $purple
+  cecho "-----> Downloading Atom Shell..." $purple
   curl -L -o $ATOM_SHELL_FILE https://github.com/atom/atom-shell/releases/download/v$ATOM_SHELL_VERSION/$ATOM_SHELL_FILE
   mkdir -p atom-shell
   unzip -d atom-shell $ATOM_SHELL_FILE
 fi
 
-if [ ! -f $BOOT2DOCKER_CLI_VERSION_FILE ]; then
-  cecho "-----> Downloading Boot2docker CLI..." $purple
-  curl -L -o $BOOT2DOCKER_CLI_VERSION_FILE https://s3.amazonaws.com/kite-installer/boot2docker-v$BOOT2DOCKER_CLI_VERSION
-fi
-
 if [ ! -f kite-node-webkit.tar.gz ]; then
   cecho "-----> Downloading node-webkit..." $purple
   curl -L -o kite-node-webkit.tar.gz https://s3.amazonaws.com/kite-installer/kite-node-webkit.tar.gz
@@ -57,8 +52,12 @@ popd
 
 pushd resources
 
-cp ../cache/$BOOT2DOCKER_CLI_VERSION_FILE $BOOT2DOCKER_CLI_FILE
-chmod +x $BOOT2DOCKER_CLI_FILE
+if [ ! -f $BOOT2DOCKER_CLI_VERSION_FILE ]; then
+  cecho "-----> Downloading Boot2docker CLI..." $purple
+  curl -L -o $BOOT2DOCKER_CLI_VERSION_FILE https://s3.amazonaws.com/kite-installer/boot2docker-v$BOOT2DOCKER_CLI_VERSION
+fi
+
+chmod +x $BOOT2DOCKER_CLI_VERSION_FILE
 
 popd