@@ -653,7 +653,7 @@ begin
653653 SelectBreadcrumb(4 );
654654 WizardForm.NextButton.Visible := True;
655655 WizardForm.BackButton.Visible := False;
656- WizardForm.NextButton.Caption := ' Close ' ;
656+ WizardForm.NextButton.Caption := ' Finish ' ;
657657 end ;
658658
659659 if (CurPageID = wpInstalling) then
@@ -677,12 +677,13 @@ begin
677677 ' ' , SW_SHOW, ewWaitUntilTerminated, ErrorCode);
678678
679679 // Install VirtualBox
680- ShellExec(' ' , ' msiexec' , ExpandConstant(' /i {tmp}\VirtualBox-5.0.2-r102096-MultiArch_x86 .msi INSTALLDIR="{app}\VirtualBox" /passive /norestart' ),
680+ ShellExec(' ' , ' msiexec' , ExpandConstant(' /i {tmp}\VirtualBox-5.0.2-r102096-MultiArch_amd64 .msi INSTALLDIR="{app}\VirtualBox" /passive /norestart' ),
681681 ' ' , SW_SHOW, ewWaitUntilTerminated, ErrorCode);
682682
683- // ShellExec('', 'msiexec', ExpandConstant('/i {tmp}\VirtualBox-5.0.2-102096-Win.exe IN
684- // ShellExec('', 'msiexec', ExpandConstant('/i {tmp}\zulu1.8.0_51-8.8.0.3-win64.msi /passive /norestart /log "{app}\zulu_install_log.txt"'),
685- // '', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
683+
684+ // Install Vagrant
685+ ShellExec(' ' , ' msiexec' , ExpandConstant(' /i {tmp}\vagrant_1.7.4.msi INSTALLDIR="{app}\Vagrant" /passive /norestart' ),
686+ ' ' , SW_SHOW, ewWaitUntilTerminated, ErrorCode);
686687 end ;
687688
688689end ;
@@ -790,8 +791,9 @@ begin
790791 // idpAddFile('http://download.virtualbox.org/virtualbox/5.0.2/VirtualBox-5.0.2-102096-Win.exe', ExpandConstant('{tmp}\VirtualBox-5.0.2-102096-Win.exe'));
791792 idpAddFile(' http://192.168.1.114/~shane/VirtualBox-5.0.2-102096-Win.exe' , ExpandConstant(' {tmp}\VirtualBox-5.0.2-102096-Win.exe' ));
792793
793-
794- // idpAddFile('https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4.msi', 'Vagrant');
794+ // Vagrant
795+ // idpAddFile('https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4.msi', ExpandConstant('{tmp}\vagrant_1.7.4.msi'));
796+ idpAddFile(' http://192.168.1.114/~shane/vagrant_1.7.4.msi' , ExpandConstant(' {tmp}\vagrant_1.7.4.msi' ));
795797
796798 idpDownloadAfter(wpReady);
797799
0 commit comments