add a better Icon, and put the on the desktop. Tweak the vbox&msys in…

…stalls to be quieter

Boot2Docker.iss

@@ -1,19 +1,21 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "Boot2Docker for Windows"
+#define MyAppName "Docker for Windows"
 #define MyAppVersion "0.9"
-#define MyAppPublisher "Boot2Docker"
+#define MyAppPublisher "Docker Inc"
 #define MyAppURL "http://boot2docker.io"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+SetupIconFile=boot2docker.ico
+
 AppId={{05BD04E9-4AB5-46AC-891E-60EA8FD57D56}
 AppCopyright=Docker Project
 AppContact=Sven Dowideit <SvenDowideit@docker.com>
-AppComments=http://boot2docker.io/
+AppComments=http://docker.com/
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
@@ -24,19 +26,25 @@ AppUpdatesURL={#MyAppURL}
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 DefaultDirName={pf}\{#MyAppName}
-DefaultGroupName=Boot 2 Docker
-InfoBeforeFile=C:\Users\svend_000\windows-installer\LICENSE
-OutputBaseFilename=boot2docker-install
+DefaultGroupName=Docker
+; lets not be annoying
+;InfoBeforeFile=C:\Users\svend_000\windows-installer\LICENSE
+;DisableFinishedPage
+;InfoAfterFile=
+OutputBaseFilename=docker-install
 Compression=lzma
 SolidCompression=yes
 WizardImageFile=logo-docker-side.bmp
-WizardSmallImageFile=logo-docker-small.bmp         
+WizardSmallImageFile=logo-docker-small.bmp  
+WizardImageStretch=no     
+WizardImageBackColor=$325461
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "C:\Users\svend_000\windows-installer\Boot2Docker\boot2docker.iso"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\svend_000\windows-installer\boot2docker.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\svend_000\windows-installer\Boot2Docker\boot2docker.exe"; DestDir: "{app}"; Flags: ignoreversion
 ;Source: "C:\Users\svend_000\windows-installer\Boot2Docker\profile"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\svend_000\windows-installer\start.sh"; DestDir: "{app}"; Flags: ignoreversion
@@ -49,21 +57,34 @@ Source: "C:\Users\svend_000\windows-installer\msys-Git\Git-1.9.0-preview20140217
 ;https://forums.virtualbox.org/viewtopic.php?f=3&t=21127
 Source: "C:\Users\svend_000\windows-installer\VirtualBox\VirtualBox-4.3.10-r93012-MultiArch_amd64.msi"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\svend_000\windows-installer\VirtualBox\common.cab"; DestDir: "{app}"; Flags: ignoreversion
+; the cert http://www.catonrug.net/2013/03/virtualbox-silent-install-store-oracle-certificate.html
+Source: "C:\Users\svend_000\windows-installer\VirtualBox\oracle-vbox.cer"; DestDir: "{app}"; Flags: ignoreversion
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{group}\Boot2Docker Shell"; WorkingDir: "{app}"; Filename: "{app}\start.sh"
-Name: "{group}\Boot2Docker Delete"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"
-Name: "{group}\MSYS Bash"; Filename: "C:\Program Files (x86)\Git\bin\sh.exe"; Parameters: "--login -i"; Flags: dontcloseonexit
+Name: "{group}\Boot2Docker Start"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/boot2docker.ico"
+Name: "{commondesktop}\Boot2Docker Start"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/boot2docker.ico"
+Name: "{commonprograms}\Boot2Docker Start"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/boot2docker.ico"
+Name: "{group}\Delete Boot2Docker VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"
+Name: "{group}\Unix Bash"; Filename: "C:\Program Files (x86)\Git\bin\sh.exe"; Parameters: "--login -i"; Flags: dontcloseonexit
 
 [Run]
 ; http://unattended.sourceforge.net/installers.php
-Description: "Install MSYS-git UNIX-like environment (Required)"; Filename: "{app}\Git-1.9.0-preview20140217.exe"; Flags: postinstall
-; Parameters: "/sp- /silent /norestart"
-Description: "Install VirtualBox virtualisation (Required)"; Filename: "msiexec"; Parameters: "/i ""{app}\VirtualBox-4.3.10-r93012-MultiArch_amd64.msi"""; Flags: postinstall
+; sadly, the auto-checkbox Flag: postinstall also means that its run after the final b2d install screen, which is not what we want.
+; TODO: unwrap the msys-git installer and just include it into this one.
+Description: "Install MSYS-git UNIX-like environment (Required)"; StatusMsg: "Installing MSYS-git UNIX-like environment"; Filename: "{app}\Git-1.9.0-preview20140217.exe"; Parameters: "/sp- /verysilent /norestart"; Flags: runhidden
+StatusMsg: "Installing vbox cert"; Filename: "certutil"; Parameters: "-addstore ""TrustedPublisher"" oracle-vbox.cer"; Flags: runhidden
+Description: "Install VirtualBox virtualisation (Required)"; StatusMsg: "Installing VirtualBox virtualisation"; Filename: "msiexec"; Parameters: "/qn /i ""{app}\VirtualBox-4.3.10-r93012-MultiArch_amd64.msi"""; Flags:
 
 [UninstallRun]
 Filename: "{app}\delete.sh"
+
+[Code]
+
+procedure CurPageChanged(CurPageID: Integer);
+begin
+    WizardForm.FinishedLabel.Caption := 'Docker for Windows installation completed.      The `Boot2Docker Start` icon on your desktop, and Program Files will initialise, start and connect you to your Boot2Docker virtual machine.';
+end;

build.sh

@@ -4,9 +4,10 @@ cd VirtualBox
 
 #http://www.virtualbox.org/manual/ch02.html
 #VirtualBox-4.3.10-93012-Win.exe -extract -silent -path .
+#http://www.catonrug.net/2013/03/virtualbox-silent-install-store-oracle-certificate.html
 
 cd ../Boot2Docker
 
-curl -o boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v0.9.1/boot2docker.iso
+curl -L -o boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v0.9.1/boot2docker.iso
 
-curl -o boot2docker.exe https://github.com/boot2docker/boot2docker-cli/releases/download/v0.9.2/boot2docker-v0.9.2-windows-amd64.exe
+curl -L -o boot2docker.exe https://github.com/boot2docker/boot2docker-cli/releases/download/v0.9.2/boot2docker-v0.9.2-windows-amd64.exe

start.sh

@@ -1,8 +1,17 @@
+#!sh
+ISO="$USERPROFILE/.boot2docker/boot2docker.iso"
+
+if [ ! -e "$ISO" ]; then
+	echo "copying initial boot2docker.iso (run 'boot2docker.exe download' to update"
+	mkdir -p "$USERPROFILE/.boot2docker"
+	cp boot2docker.iso "$ISO"
+fi
+
 echo "initialising..."
 ./boot2docker.exe init
 echo "starting..."
 ./boot2docker.exe start
-echo "connecting... (password: tcuser)"
+echo "connecting..."
 ./boot2docker.exe ssh
 
 read