docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing icons, start script & bug where some components would be unchecked

This commit is contained in:
Jeffrey Morgan 2015-07-11 14:46:13 -07:00
parent 5639ed44db
commit db0a9726fc
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
windows/Toolbox.iss
View File

@ -83,7 +83,7 @@ Name: "VirtualBox"; Description: "VirtualBox"; Types: full
Name: "MSYS"; Description: "MSYS-git UNIX tools"; Types: full Name: "MSYS"; Description: "MSYS-git UNIX tools"; Types: full
[Files] [Files]
Source: ".\toolbox.ico"; DestDir: "{app}"; Flags: ignoreversion Source: ".\docker-cli.ico"; DestDir: "{app}"; Flags: ignoreversion
; Docker ; Docker
Source: "{#dockerCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker" Source: "{#dockerCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
@ -110,9 +110,9 @@ Source: "{#virtualBoxMsi}"; DestDir: "{app}\installers\virtualbox"; DestName: "v
[Icons] [Icons]
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Components: "Docker" Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Components: "Docker"
Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Tasks: desktopicon; Components: "Docker" Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Tasks: desktopicon; Components: "Docker"
Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Components: "Docker" Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Components: "Docker"
Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"; Components: "DockerMachine" Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"; Components: "DockerMachine"
[UninstallRun] [UninstallRun]
@ -213,15 +213,15 @@ begin
//WizardForm.NextButton.Caption := SetupMessage(msgButtonNext); //WizardForm.NextButton.Caption := SetupMessage(msgButtonNext);
//if CurPageID = wpFinished then //if CurPageID = wpFinished then
//WizardForm.NextButton.Caption := SetupMessage(msgButtonFinish) //WizardForm.NextButton.Caption := SetupMessage(msgButtonFinish)
if CurPageID = wpSelectComponents then // if CurPageID = wpSelectComponents then
begin // begin
if IsUpgrade() then // if IsUpgrade() then
begin // begin
Wizardform.TypesCombo.ItemIndex := 2 // Wizardform.TypesCombo.ItemIndex := 2
end; // end;
Wizardform.ComponentsList.Checked[2] := NeedToInstallVirtualBox(); // Wizardform.ComponentsList.Checked[3] := NeedToInstallVirtualBox();
Wizardform.ComponentsList.Checked[3] := NeedToInstallMSYS(); // Wizardform.ComponentsList.Checked[4] := NeedToInstallMSYS();
end; // end;
end; end;
procedure RunInstallVirtualBox(); procedure RunInstallVirtualBox();

BIN
windows/docker-cli.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

2
windows/start.sh
View File

@ -24,6 +24,8 @@ echo "Setting environment variables for machine $VM..."
./docker-machine.exe env $VM | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path ./docker-machine.exe env $VM | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path
eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')" eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')"
cd
clear clear
cat << EOF cat << EOF

BIN
windows/toolbox.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB