diff --git a/osx/installerplugins/common/mixpanel.h b/osx/installerplugins/common/mixpanel.h
index b9adce94a5..f5e580d818 100644
--- a/osx/installerplugins/common/mixpanel.h
+++ b/osx/installerplugins/common/mixpanel.h
@@ -19,7 +19,7 @@
@implementation Mixpanel
-+ (NSString *) trackingUUID {
++ (NSString *) uuid {
NSString *cachePath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex:0];
NSString *cacheDirPath = [NSString pathWithComponents:[NSArray arrayWithObjects:cachePath, @"io.docker.pkg.toolbox", nil]];
NSString *cacheFilePath = [NSString pathWithComponents:[NSArray arrayWithObjects:cacheDirPath, @"id", nil]];
@@ -37,7 +37,7 @@
+ (void) trackEvent:(NSString *)name forPane:(InstallerPane*)pane {
BOOL trackingDisabled = [[[[pane section] sharedDictionary] objectForKey:@"disableTracking"] boolValue];
- NSString *uuid = [self trackingUUID];
+ NSString *uuid = [self uuid];
if (!uuid || trackingDisabled) {
return;
diff --git a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib
index 36d346c7df..aaf1261f91 100644
--- a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib
+++ b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib
@@ -24,30 +24,22 @@
-
-
+
-
+
-
+
-
+
@@ -65,6 +57,14 @@
+
diff --git a/osx/installerplugins/overviewplugin/Info.plist b/osx/installerplugins/overviewplugin/Info.plist
index 2d9b3315a6..4d99e86ca6 100644
--- a/osx/installerplugins/overviewplugin/Info.plist
+++ b/osx/installerplugins/overviewplugin/Info.plist
@@ -28,5 +28,9 @@
overviewplugin
NSPrincipalClass
InstallerSection
+ Installer Version
+ %INSTALLER_VERSION%
+ Mixpanel Token
+ %MIXPANEL_TOKEN%
diff --git a/osx/installerplugins/quickstartplugin/quickstartpluginPane.m b/osx/installerplugins/quickstartplugin/quickstartpluginPane.m
index e33ee54f50..446021b7fe 100644
--- a/osx/installerplugins/quickstartplugin/quickstartpluginPane.m
+++ b/osx/installerplugins/quickstartplugin/quickstartpluginPane.m
@@ -16,6 +16,8 @@
}
- (void) willEnterPane:(InstallerSectionDirection)dir {
+ self.previousEnabled = NO;
+
BOOL kitematicInstalled = [[NSFileManager defaultManager] fileExistsAtPath:@"/Applications/Docker/Kitematic (Beta).app"];
BOOL quickstartInstalled = [[NSFileManager defaultManager] fileExistsAtPath:@"/Applications/Docker/Docker Quickstart Terminal.app"];
diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin
index cf35c883dc..d0bb22528d 100755
Binary files a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin and b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin differ
diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist
index 9a452200d2..b7b652b2b1 100644
--- a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist
+++ b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist
@@ -36,8 +36,12 @@
0640
DTXcodeBuild
6E35b
+ Installer Version
+ %INSTALLER_VERSION%
InstallerSectionTitle
Overview
+ Mixpanel Token
+ %MIXPANEL_TOKEN%
NSHumanReadableCopyright
Copyright © 2015 Docker Inc. All rights reserved.
NSMainNibFile
diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin
index 14646806fb..8af860b96e 100755
Binary files a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin and b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin differ
diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib
index f6fba732dc..6f421a954c 100644
Binary files a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib and b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib differ
diff --git a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin
index 3846f7f162..1eed5071ea 100755
Binary files a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin and b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin differ
diff --git a/osx/mpkg/Resources/en.lproj/welcome.rtfd/TXT.rtf b/osx/mpkg/Resources/en.lproj/welcome.rtfd/TXT.rtf
index b7832623c3..2d7f1334d6 100644
--- a/osx/mpkg/Resources/en.lproj/welcome.rtfd/TXT.rtf
+++ b/osx/mpkg/Resources/en.lproj/welcome.rtfd/TXT.rtf
@@ -1,6 +1,5 @@
{\rtf1\ansi\ansicpg1252\cocoartf1397
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 HelveticaNeue-Bold;\f2\fnil\fcharset0 HelveticaNeue;
-}
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 HelveticaNeue;}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww10800\viewh8400\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
@@ -8,9 +7,9 @@
\f0\fs24 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\qc\partightenfactor0
-\f1\b\fs48 \cf0 Install Docker Toolbox
-\f2\b0 \
-%INSTALLER_VERSION%
+\f1\b\fs48 \cf0 Docker Toolbox Installer
+\b0 \
+version %INSTALLER_VERSION%
\f0 \
\