Update the bundle installers for the MSI packages; these probably belong with the...

svn:r18849

diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi
index 639a29e4120b133ac738fa8224736ab0fe337e0f..0f1d82f3e605a8b32636f1171c2834d8680c8250 100644 (file)
--- a/contrib/bundle.nsi
+++ b/contrib/bundle.nsi
@@ -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 @@ Section "Tor" Tor
 SectionEnd
 
 Function ExtractPackages
+       File "license.msi"
        File "tor.msi"
        File "torbutton.msi"
        File "thandy.msi"
@@ -49,6 +50,7 @@ Function ExtractPackages
 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'

diff --git a/contrib/netinst.nsi b/contrib/netinst.nsi
index 8e3e53a4021f0e9b052ce0f272014f7af63205ef..ef93aa07003049ae1262927b6f6c6c61369a590b 100644 (file)
--- a/contrib/netinst.nsi
+++ b/contrib/netinst.nsi
@@ -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 @@ Section "Tor" Tor
 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 @@ Function LaunchVidalia
 FunctionEnd
 
 Function CleanUpTemp
+       ExecWait '"del" "$INSTDIR\license.msi"'
        ExecWait '"del" "$INSTDIR\thandy.msi"'
        SetOutPath $TEMP
        RMDir /r $TEMP\TorInstTmp