From d5dca184b54b60359c097729ee62b370bccebde5 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 5 Nov 2015 16:55:45 -0800 Subject: [PATCH] Fix metrics bugs on Windows Signed-off-by: Jeffrey Morgan --- Dockerfile.osx | 5 +- Dockerfile.windows | 2 +- .../Base.lproj/overviewplugin.xib | 19 ++-- .../overviewplugin/overviewpluginPane.h | 1 - .../Contents/MacOS/overviewplugin | Bin 56204 -> 56204 bytes .../Resources/Base.lproj/overviewplugin.nib | Bin 9131 -> 8982 bytes osx/mpkg/Resources/en.lproj/Installed.html | 14 --- windows/Toolbox.iss | 90 ++++-------------- windows/migrate.bat | 4 - windows/migrate.sh | 4 - 10 files changed, 31 insertions(+), 108 deletions(-) delete mode 100644 osx/mpkg/Resources/en.lproj/Installed.html delete mode 100644 windows/migrate.bat delete mode 100644 windows/migrate.sh diff --git a/Dockerfile.osx b/Dockerfile.osx index 3b5c2b5a2c..b9fdf06992 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -26,7 +26,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV INSTALLER_VERSION 1.9.0 +ENV INSTALLER_VERSION 1.9.0a ENV DOCKER_VERSION 1.9.0 # RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION RUN curl -fsSL -o docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION @@ -192,9 +192,6 @@ RUN sed -i \ RUN sed -i \ -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ mpkg/Resources/en.lproj/welcome.rtfd/TXT.rtf -RUN sed -i \ - -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ - mpkg/Resources/en.lproj/Installed.html RUN sed -i \ -e "s/%VBOX_VERSION%/$VBOX_VERSION/g" \ /mpkg/Distribution && \ diff --git a/Dockerfile.windows b/Dockerfile.windows index ec7ad433a6..049535a076 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -17,7 +17,7 @@ RUN cd innosetup && \ wine "./innounp.exe" -e "is-unicode.exe" # installer components -ENV INSTALLER_VERSION 1.9.0 +ENV INSTALLER_VERSION 1.9.0a ENV DOCKER_VERSION 1.9.0 ENV DOCKER_MACHINE_VERSION 0.5.0 ENV DOCKER_COMPOSE_VERSION 1.5.0 diff --git a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib index 063b563f76..27e30f1436 100644 --- a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib +++ b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib @@ -1,8 +1,8 @@ - + - + @@ -31,9 +31,6 @@ - - - @@ -47,20 +44,20 @@ - - + + - - + + - + - + diff --git a/osx/installerplugins/overviewplugin/overviewpluginPane.h b/osx/installerplugins/overviewplugin/overviewpluginPane.h index ad65ee4c32..fc2b2fe0b4 100644 --- a/osx/installerplugins/overviewplugin/overviewpluginPane.h +++ b/osx/installerplugins/overviewplugin/overviewpluginPane.h @@ -9,7 +9,6 @@ #import @interface overviewpluginPane : InstallerPane -- (IBAction)checkboxChanged:(id)sender; @property (unsafe_unretained) IBOutlet NSTextView *textView; @property (weak) IBOutlet NSButton *checkbox; @end diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin index 7f22614641d571dd078cfa8b921f35b72beb96ae..6a96bc052a66e797b23566da568a3404cf597998 100755 GIT binary patch delta 18 acmeC#&fK$|dBcwy=GQ;0H~+4g7zY4aS_$g_ delta 18 acmeC#&fK$|dBcwy=Er)5n}63#i~|5vSP2gR 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 a5d0f1b027c7ac9a8f4109ddfc5dfbec2f5800eb..95392d5f7c25d2979036d53186c5b44d702b8839 100644 GIT binary patch delta 5001 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 XH{=8I>F~yZknlGX8UAj(%4h!vOL}M` delta 5210 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 CbC**9 diff --git a/osx/mpkg/Resources/en.lproj/Installed.html b/osx/mpkg/Resources/en.lproj/Installed.html deleted file mode 100644 index 93b0607199..0000000000 --- a/osx/mpkg/Resources/en.lproj/Installed.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - Docker Toolbox for Mac OS X - - - -

Installation Successful!

-

Upgrade your VM:

-
    -
  1. Open a Terminal window.
    2. -
  2. Enter the following command:
    docker-machine upgrade default
    3. - - diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss index 40dac0a42f..f5c8c93ec6 100644 --- a/windows/Toolbox.iss +++ b/windows/Toolbox.iss @@ -69,8 +69,6 @@ Source: ".\start.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docke Source: ".\delete.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker" Source: "{#dockerMachineCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine" Source: "{#dockerComposeCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerCompose" -Source: ".\migrate.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine" -Source: ".\migrate.bat"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine" Source: "{#kitematic}\*"; DestDir: "{app}\kitematic"; Flags: ignoreversion recursesubdirs; Components: "Kitematic" Source: "{#b2dIsoPath}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine"; AfterInstall: CopyBoot2DockerISO() Source: "{#git}"; DestDir: "{app}\installers\git"; DestName: "git.exe"; AfterInstall: RunInstallGit(); Components: "Git" @@ -98,7 +96,7 @@ Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"DOCKER_TOOLBOX_I var restart: boolean; - TrackingDisabled: Boolean; + TrackingDisabled: Boolean; TrackingCheckBox: TNewCheckBox; function uuid(): String; @@ -140,15 +138,20 @@ begin end; end; -procedure TrackEvent(name: String); +procedure TrackEventWithProperties(name: String; properties: String); var payload: String; WinHttpReq: Variant; + tracking: String; begin if TrackingDisabled or WizardSilent() then exit; + + if Length(properties) > 0 then + properties := ', ' + properties; + try - payload := Encode64(Format(ExpandConstant('{{"event": "%s", "properties": {{"token": "{#MixpanelToken}", "distinct_id": "%s", "os": "win32", "os version": "%s", "version": "{#MyAppVersion}"}}'), [name, uuid(), WindowsVersionString()])); + payload := Encode64(Format(ExpandConstant('{{"event": "%s", "properties": {{"token": "{#MixpanelToken}", "distinct_id": "%s", "os": "win32", "os version": "%s", "version": "{#MyAppVersion}" %s}}'), [name, uuid(), WindowsVersionString(), properties])); WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1'); WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data=' + payload, false); WinHttpReq.SetRequestHeader('Content-Type', 'application/json'); @@ -157,9 +160,9 @@ begin end; end; -function NeedRestart(): Boolean; +procedure TrackEvent(name: String); begin - Result := restart; + TrackEventWithProperties(name, ''); end; function NeedToInstallVirtualBox(): Boolean; @@ -186,17 +189,6 @@ begin Result := not DirExists('C:\Program Files\Git') or not FileExists('C:\Program Files\Git\git-bash.exe') end; -procedure TrackingCheckBoxClicked(Sender: TObject); -begin - if TrackingCheckBox.Checked then begin - TrackingDisabled := False; - TrackEvent('Enabled Tracking'); - end else begin - TrackEvent('Disabled Tracking'); - TrackingDisabled := True; - end; -end; - procedure InitializeWizard; var WelcomePage: TWizardPage; @@ -211,11 +203,10 @@ begin TrackingCheckBox.Top := WizardForm.WelcomeLabel2.Top + WizardForm.WelcomeLabel2.Height + 10; TrackingCheckBox.Left := WizardForm.WelcomeLabel2.Left; TrackingCheckBox.Width := WizardForm.WelcomeLabel2.Width; - TrackingCheckBox.Height := 40; + TrackingCheckBox.Height := 28; TrackingCheckBox.Caption := 'Help Docker improve Toolbox.'; TrackingCheckBox.Checked := True; TrackingCheckBox.Parent := WelcomePage.Surface; - TrackingCheckBox.OnClick := @TrackingCheckboxClicked; TrackingLabel := TLabel.Create(WizardForm); TrackingLabel.Parent := WelcomePage.Surface; @@ -226,8 +217,8 @@ begin TrackingLabel.Visible := True; TrackingLabel.Left := WizardForm.WelcomeLabel2.Left; TrackingLabel.Width := WizardForm.WelcomeLabel2.Width; - TrackingLabel.Top := TrackingCheckBox.Top + TrackingCheckBox.Height + 20; - TrackingLabel.Height := 300; + TrackingLabel.Top := TrackingCheckBox.Top + TrackingCheckBox.Height + 5; + TrackingLabel.Height := 50; // Don't do this until we can compare versions // Wizardform.ComponentsList.Checked[3] := NeedToInstallVirtualBox(); @@ -245,7 +236,13 @@ end; function NextButtonClick(CurPageID: Integer): Boolean; begin if CurPageID = wpWelcome then begin - TrackEvent('Continued from Overview'); + if TrackingCheckBox.Checked then begin + TrackEventWithProperties('Continued from Overview', '"Tracking Enabled": "Yes"'); + TrackingDisabled := False; + end else begin + TrackEventWithProperties('Continued from Overview', '"Tracking Enabled": "No"'); + TrackingDisabled := True; + end; end; Result := True end; @@ -329,49 +326,6 @@ begin Result := true end; -function MigrateVM() : Boolean; -var - ResultCode: Integer; -begin - if NeedToInstallGit() or NeedToInstallVirtualBox() or not FileExists(ExpandConstant('{app}\docker-machine.exe')) then begin - Result := true - exit - end; - - ExecAsOriginalUser(VBoxPath() + 'VBoxManage.exe', 'showvminfo default', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) - if ResultCode <> 1 then begin - Result := true - exit - end; - - ExecAsOriginalUser(VBoxPath() + 'VBoxManage.exe', 'showvminfo boot2docker-vm', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) - if ResultCode <> 0 then begin - Result := true - exit - end; - - TrackEvent('Boot2Docker Migration Started'); - 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 - begin - TrackEvent('Boot2Docker Migration Succeeded'); - MsgBox('Succcessfully migrated Boot2Docker VM to a Docker Machine VM named "default"', mbInformation, MB_OK); - end - else begin - TrackEvent('Boot2Docker Migration Failed'); - MsgBox('Migration of Boot2Docker VM failed. Please file an issue with the migration logs at https://github.com/docker/toolbox/issues/new.', mbCriticalError, MB_OK); - Exec(ExpandConstant('{win}\notepad.exe'), ExpandConstant('{localappdata}\Temp\toolbox-migration-logs.txt'), '', SW_SHOW, ewNoWait, ResultCode) - Result := false - WizardForm.Close; - exit; - end; - Result := true -end; - const ModPathName = 'modifypath'; ModPathType = 'user'; @@ -390,6 +344,7 @@ begin Success := True; if CurStep = ssPostInstall then begin + trackEvent('Installing Files Succeeded'); if IsTaskSelected(ModPathName) then ModPath(); if not WizardSilent() then @@ -399,9 +354,6 @@ begin if CanUpgradeVM() then begin Success := UpgradeVM(); end; - // else begin - // Success := MigrateVM(); - // end; end; end; diff --git a/windows/migrate.bat b/windows/migrate.bat deleted file mode 100644 index e569e03431..0000000000 --- a/windows/migrate.bat +++ /dev/null @@ -1,4 +0,0 @@ -:: Batch file that installer can run. Simply runs bash script with the same name - -cd %~dp0 -"C:\Program Files\Git\bin\sh.exe" --login -i migrate.sh diff --git a/windows/migrate.sh b/windows/migrate.sh deleted file mode 100644 index e584e117e1..0000000000 --- a/windows/migrate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -set -o pipefail -./docker-machine -D create -d virtualbox --virtualbox-memory 2048 --virtualbox-import-boot2docker-vm boot2docker-vm default | sed -e '/BEGIN/,/END/d'