[or-cvs] r18849: {tor} Update the bundle installers for the MSI packages; these pro (tor/trunk/contrib)

[coderman@xxxxxxxx]

Author: coderman
Date: 2009-03-10 05:28:28 -0400 (Tue, 10 Mar 2009)
New Revision: 18849

Modified:
   tor/trunk/contrib/bundle.nsi
   tor/trunk/contrib/netinst.nsi
Log:
Update the bundle installers for the MSI packages; these probably belong with the wxs files in the Vidalia repo.

Modified: tor/trunk/contrib/bundle.nsi
===================================================================
--- tor/trunk/contrib/bundle.nsi	2009-03-10 09:00:59 UTC (rev 18848)
+++ tor/trunk/contrib/bundle.nsi	2009-03-10 09:28:28 UTC (rev 18849)
@@ -2,7 +2,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
   
-!define VERSION "0.2.1.10"
+!define VERSION "0.2.1.13"
 !define INSTALLER "TorBundle.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
@@ -40,6 +40,7 @@
 SectionEnd
 
 Function ExtractPackages
+	File "license.msi"
 	File "tor.msi"
 	File "torbutton.msi"
 	File "thandy.msi"
@@ -49,6 +50,7 @@
 FunctionEnd
 
 Function RunInstallers
+	ExecWait 'msiexec /i "$INSTDIR\license.msi" /qn'
 	ExecWait 'msiexec /i "$INSTDIR\tor.msi" NOSC=1 /qn'
 	ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
 	ExecWait 'msiexec /i "$INSTDIR\polipo.msi" NOSC=1 /qn'

Modified: tor/trunk/contrib/netinst.nsi
===================================================================
--- tor/trunk/contrib/netinst.nsi	2009-03-10 09:00:59 UTC (rev 18848)
+++ tor/trunk/contrib/netinst.nsi	2009-03-10 09:28:28 UTC (rev 18849)
@@ -2,7 +2,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
   
-!define VERSION "0.2.1.10"
+!define VERSION "0.2.1.13"
 !define INSTALLER "TorNetInstaller.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
@@ -41,10 +41,12 @@
 SectionEnd
 
 Function ExtractPackages
+	File "license.msi"
 	File "thandy.msi"
 FunctionEnd
 
 Function RunInstallers
+	ExecWait 'msiexec /i "$INSTDIR\license.msi" /qn'
 	ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
 	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\Tor Updates" /bundleinfo/tor/win32/'
 	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
@@ -64,6 +66,7 @@
 FunctionEnd
 
 Function CleanUpTemp
+	ExecWait '"del" "$INSTDIR\license.msi"'
 	ExecWait '"del" "$INSTDIR\thandy.msi"'
 	SetOutPath $TEMP
 	RMDir /r $TEMP\TorInstTmp