Update the bundle installers for the MSI packages; these probably belong with the wxs files in the Vidalia repo.

svn:r18849
This commit is contained in:
Martin Peck 2009-03-10 09:28:28 +00:00
parent 43145fc9f5
commit 387c2f5a2f
2 changed files with 7 additions and 2 deletions

View File

@ -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'

View File

@ -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