From 895c92cce7e8b4dae325e67e4930f904e3970d26 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 12 Aug 2015 13:52:39 -0700 Subject: [PATCH] Removing the need for sed in quickstart --- windows/start.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/windows/start.sh b/windows/start.sh index dd921eb7e9..e45f37f2a7 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -20,22 +20,20 @@ VM_EXISTS_CODE=$? set -e -if [ $VM_EXISTS_CODE -ne 0 ]; then +if [ $VM_EXISTS_CODE -eq 1 ]; then echo "Creating Machine $VM..." $DOCKER_MACHINE rm -f $VM &> /dev/null || : rm -rf ~/.docker/machine/machines/$VM $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM else - echo "Machine $VM already exists." + echo "Machine $VM already exists in VirtualBox." fi echo "Starting machine $VM..." $DOCKER_MACHINE start $VM echo "Setting environment variables for machine $VM..." -./docker-machine.exe env $VM | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path - -eval "$($DOCKER_MACHINE env $VM 2>/dev/null | sed 's,\\,\\\\,g')" +eval "$($DOCKER_MACHINE env $VM)" clear cat << EOF