From 05ca1fc9a7648ac9ca13f07469e8ab9881a5b836 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 12 Aug 2015 15:09:06 -0700 Subject: [PATCH] Only offer to migrate if requirements are met Signed-off-by: Jeffrey Morgan --- windows/Toolbox.iss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss index b7bf2745c7..0ab2fef7ef 100644 --- a/windows/Toolbox.iss +++ b/windows/Toolbox.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Docker Toolbox" -#define MyAppVersion "1.8.0" +#define MyAppVersion "1.8.0b" #define MyAppPublisher "Docker" #define MyAppURL "https://docker.com" #define MyAppContact "https://docs.docker.com" @@ -305,6 +305,12 @@ function MigrateVM() : Boolean; var ResultCode: Integer; begin + if not FileExists('C:\Program Files\Oracle\VirtualBox\VBoxManage.exe') or not FileExists(ExpandConstant('{app}\docker-machine.exe')) then + begin + Result := true + exit + end; + ExecAsOriginalUser('C:\Program Files\Oracle\VirtualBox\VBoxManage.exe', 'showvminfo default', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) if ResultCode <> 1 then begin @@ -364,9 +370,7 @@ begin if IsTaskSelected(taskname) then ModPath(); - migrationSuccess:= true - if IsComponentSelected('DockerMachine') then - migrationSuccess := MigrateVM(); + migrationSuccess:= MigrateVM(); if migrationSuccess then begin