diff options
| author | Martin Peck <coder@peertech.org> | 2009-03-10 09:28:28 +0000 |
|---|---|---|
| committer | Martin Peck <coder@peertech.org> | 2009-03-10 09:28:28 +0000 |
| commit | 387c2f5a2f77cf413c58bf1e58959006de31ca13 (patch) | |
| tree | b8ae9cc929d15a925d7beb70fb2942f6315257f6 /contrib | |
| parent | 43145fc9f556ab155deed39b9738b75334278dcd (diff) | |
| download | tor-387c2f5a2f77cf413c58bf1e58959006de31ca13.tar.gz tor-387c2f5a2f77cf413c58bf1e58959006de31ca13.zip | |
Update the bundle installers for the MSI packages; these probably belong with the wxs files in the Vidalia repo.
svn:r18849
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bundle.nsi | 4 | ||||
| -rw-r--r-- | contrib/netinst.nsi | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi index 639a29e412..0f1d82f3e6 100644 --- 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 8e3e53a402..ef93aa0700 100644 --- 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 |