Do not allow user to remove checkboxes that are required for install …

…to work Signed-off-by: Jeffrey Morgan <[email protected]>
docker-archive · Sep 9, 2015 · 0be4f32 · 0be4f32
1 parent 7ef9d39
commit 0be4f32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution
@@ -13,7 +13,7 @@
         <line choice="choiceVBox"/>
         <line choice="choiceBoot2DockerISO"/>
     </choices-outline>
-    <choice id="choiceDockerCLI" title="choiceDockerCLI_title" description="choiceDockerCLI_msg" start_selected="true" start_visible="true">
+    <choice id="choiceDockerCLI" title="choiceDockerCLI_title" description="choiceDockerCLI_msg" start_enabled="false" start_selected="true" start_visible="true">
         <pkg-ref id="io.docker.pkg.docker"/>
     </choice>
     <choice id="choiceDockerComposeCLI" title="choiceDockerComposeCLI_title" description="choiceDockerComposeCLI_msg" start_selected="true" start_enabled="true" start_visible="true">
@@ -73,7 +73,7 @@
     <pkg-ref id="io.docker.pkg.kitematicapp">
         <bundle-version/>
     </pkg-ref>
-    <choice id="choiceDockerMachineCLI" title="choiceDockerMachineCLI_title" description="choiceDockerMachineCLI_msg" start_selected="true" start_enabled="true" start_visible="true">
+    <choice id="choiceDockerMachineCLI" title="choiceDockerMachineCLI_title" description="choiceDockerMachineCLI_msg" start_enabled="false" start_selected="true" start_visible="true">
         <pkg-ref id="io.docker.pkg.dockermachine"/>
     </choice>
     <pkg-ref id="io.docker.pkg.dockermachine" auth="Root" version="%DOCKERMACHINE_VERSION%" installKBytes="%DOCKERMACHINE_INSTALL_KBYTES%">#dockermachine.pkg</pkg-ref>
@@ -148,7 +148,7 @@
      {
          try {
              vboxplist = system.files.plistAtPath('/Applications/VirtualBox.app/Contents/Info.plist');
-             if (!vboxplist || !vboxplist.CFBundleVersion || (vboxplist.CFBundleVersion === '5.0.2' && system.version.ProductVersion !== '10.11') || system.compareVersions(vboxplist.CFBundleVersion, '%VBOX_VERSION%') === -1) {
+             if (!vboxplist || !vboxplist.CFBundleVersion || system.compareVersions(vboxplist.CFBundleVersion, '%VBOX_VERSION%') === -1) {
                  return true;
              }
 

diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss
@@ -43,7 +43,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Types]
 Name: "full"; Description: "Full installation"
-Name: "upgrade"; Description: "Upgrade Docker Toolbox only"
 Name: "custom"; Description: "Custom installation"; Flags: iscustom
 
 [Run]
@@ -54,11 +53,11 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"
 Name: modifypath; Description: "Add docker.exe & docker-machine.exe to &PATH"
 
 [Components]
-Name: "Docker"; Description: "Docker Client for Windows" ; Types: full upgrade
-Name: "DockerMachine"; Description: "Docker Machine for Windows" ; Types: full upgrade
-Name: "Kitematic"; Description: "Kitematic for Windows (Alpha)" ; Types: full upgrade
-Name: "VirtualBox"; Description: "VirtualBox"; Types: full; Flags: disablenouninstallwarning
-Name: "Git"; Description: "Git for Windows"; Types: full; Flags: disablenouninstallwarning
+Name: "Docker"; Description: "Docker Client for Windows" ; Types: full custom; Flags: fixed
+Name: "DockerMachine"; Description: "Docker Machine for Windows" ; Types: full custom; Flags: fixed
+Name: "VirtualBox"; Description: "VirtualBox"; Types: full custom; Flags: disablenouninstallwarning
+Name: "Kitematic"; Description: "Kitematic for Windows (Alpha)" ; Types: full custom
+Name: "Git"; Description: "Git for Windows"; Types: full custom; Flags: disablenouninstallwarning
 
 [Files]
 Source: ".\docker-quickstart-terminal.ico"; DestDir: "{app}"; Flags: ignoreversion
@@ -255,8 +254,10 @@ begin
 		'For further information, please see the {#MyAppName} installation documentation link.'
 
 		// Don't do this until we can compare versions
-		// Wizardform.ComponentsList.Checked[3] := NeedToInstallVirtualBox();
+		// Wizardform.ComponentsList.Checked[2] := NeedToInstallVirtualBox();
+		Wizardform.ComponentsList.ItemEnabled[2] := not NeedToInstallVirtualBox();
 		Wizardform.ComponentsList.Checked[4] := NeedToInstallGit();
+		Wizardform.ComponentsList.ItemEnabled[4] := not NeedToInstallGit();
 end;
 
 function InitializeSetup(): boolean;