Merge branch 'release/v0.12.1'

Author: lmakarov

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.12.1 (2015-06-06)
+
+- Minor fixes in the setup.sh script for Mac
+
 ## 0.12.0 (2015-05-07)
 
 - Use our own vagrant box - [blinkreaction/boot2docker](https://vagrantcloud.com/blinkreaction/boxes/boot2docker)

README.md

@@ -15,9 +15,13 @@ The stock boot2docker currently mounts host volumes via the default VirtualBox G
 ## Setup and usage
 
 ### Automatic installation (Mac only)
-This installs the following prerequisites and dependencies: brew, cask, virtualbox, vagrant, docker, docker-compose
 
-    curl https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/master/setup.sh | bash
+The following tools will be installed: brew, cask, virtualbox, vagrant, docker, docker-compose.
+In case you already have some of these installed (virtualbox, vagrant), it may be best (though not required) to either follow the manual install process or uninstall them before proceeding.
+
+Run the following command within your `<Projects>` (shared boo2docker VM for multiple projects, recommended) or `<Project>` (dedicated boot2docker VM) directory:
+
+    curl -s https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/master/setup.sh | bash
 
 ### Manual installation (Windows)
 

VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

setup.sh

@@ -40,7 +40,7 @@ curl -sO https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/mas
 
 # Download and renaming vagrant.yml.dist
 echo -e "${green}Downloading and renaming vagrant.yml.dist into the current directory...${NC}"
-curl https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/master/vagrant.yml.dist > vagrant.yml
+curl -s https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/master/vagrant.yml.dist > vagrant.yml
 
 # Start the boot2docker VM
 echo -e "${green}Starting the boot2docker VM...${NC}"
@@ -61,6 +61,8 @@ if [[ $SOURCE_FILE ]]; then
 		echo -e "${green}Adding automatic DOCKER_HOST export to $HOME/$SOURCE_FILE${NC}"
 		echo -e $DOCKER_HOST_EXPORT >> $HOME/$SOURCE_FILE
 	fi
+	# Source the file so we can use the DOCKER_HOST variabel right away.
+	source $HOME/$SOURCE_FILE
 else
 	echo -e "${red}Cannot detect your shell. Please manually add the following to your respective .rc or .profile file:${NC}"
 	echo -e "$DOCKER_HOST_EXPORT"
@@ -70,5 +72,5 @@ fi
 echo -e "${green}Checking that everything is in place...${NC}"
 docker version
 if [[ $? -ne 0 ]]; then
-	echo -e "${red}Something went wrong. Please review console output for possible clues."
+	echo -e "${red}Something went wrong. Please review console output for possible clues.${NC}"
 fi