mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 05:03:43 +01:00
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:
parent
43145fc9f5
commit
387c2f5a2f
@ -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'
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user