Fix minor errors on windows

docker-archive · Aug 11, 2015 · a7e7a07 · a7e7a07
1 parent 74a1fde
commit a7e7a07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss
@@ -323,6 +323,7 @@ begin
   begin
     WizardForm.StatusLabel.Caption := 'Migrating Boot2Docker VM...'
     WizardForm.FilenameLabel.Caption := 'This will take a minute...'
+    ExecAsOriginalUser(ExpandConstant('{app}\docker-machine.exe'), ExpandConstant('rm -f default > nul 2>&1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
     DelTree(ExpandConstant('{userdocs}\..\.docker\machine\machines\default'), True, True, True);
     ExecAsOriginalUser(ExpandConstant('{app}\migrate.bat'), ExpandConstant('> {localappdata}\Temp\toolbox-migration-logs.txt 2>&1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
     if ResultCode = 0 then

diff --git a/windows/start.sh b/windows/start.sh
@@ -16,6 +16,7 @@ set -e
 
 if [ $VM_EXISTS_CODE -ne 0 ]; 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