Merge branch 'master' of github.com:docker/toolbox

VERSION

@@ -0,0 +1 @@
+1.7.0

osx/mpkg/Resources/en.lproj/Welcome.html

@@ -8,16 +8,17 @@
 
     <p>
         This installer guides you through an installation of
-        <b>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</b>.
+        <strong>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</strong>.
    </p>
    <p>
         The Docker Toolbox installer includes the following:
     </p>
     <ul>
-      <li>the Docker Engine <code>docker</code> binary
-      <li>the Docker Machine <code>docker-machine</code> binary
-      <li>the Docker Compose <code>docker-compose</code> binary
-      <li>a shell preconfigured as a Docker command line environment
+      <li>Docker Engine <code>docker</code> binary </li>
+      <li>Docker Machine <code>docker-machine</code> binary </li>
+      <li>Docker Compose <code>docker-compose</code> binary </li>
+      <li>Kitematic - Desktop GUI for Docker </li>
+      <li>a shell preconfigured as a Docker command line environment </li>
     </ul>
     <br/>
   <p>
@@ -25,7 +26,7 @@
 	</p>
 
     <p>
-        To continue, click <b>Continue</b>.
+        To continue, click <strong>Continue</strong>.
     </p>
 </body>
 </html>

windows/start.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 ISO=$HOME/.docker/machine/cache/boot2docker.iso
 VM=dev
 DOCKER_MACHINE=./docker-machine.exe
@@ -9,10 +12,10 @@ if [ ! -f $ISO ]; then
 	cp ./boot2docker.iso "$ISO"
 fi
 
-machine=$($DOCKER_MACHINE ls -q | grep "^$VM$")
+machine=$($DOCKER_MACHINE ls -q | grep "^$VM$") || :
 if [ -z $machine ]; then
   echo "Creating Machine $VM..."
-   $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
+  $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
 else
   echo "Machine $VM already exists."
 fi
@@ -26,8 +29,8 @@ echo "Setting environment variables for machine $VM..."
 eval "$(./docker-machine.exe env $VM 2>/dev/null | sed  's,\\,\\\\,g')"
 
 cd
-clear
 
+clear
 cat << EOF