From 0e5973dec27c5c9d4e711423ab1257bb53bdb875 Mon Sep 17 00:00:00 2001
From: Martin Peck <coder@peertech.org>
Date: Fri, 16 Jan 2009 00:00:53 +0000
Subject: [PATCH] Add the front end installer exe NSIS scripts for the bundle
 and net installer packages.  And icon used for them.

svn:r18123
---
 contrib/bundle.nsi    |  65 ++++++++++++++++++++++++++++++++++++++
 contrib/netinst.nsi   |  71 ++++++++++++++++++++++++++++++++++++++++++
 contrib/torinst32.ico | Bin 0 -> 4286 bytes
 3 files changed, 136 insertions(+)
 create mode 100644 contrib/bundle.nsi
 create mode 100644 contrib/netinst.nsi
 create mode 100644 contrib/torinst32.ico

diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi
new file mode 100644
index 000000000..639a29e41
--- /dev/null
+++ b/contrib/bundle.nsi
@@ -0,0 +1,65 @@
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+!include "FileFunc.nsh"
+  
+!define VERSION "0.2.1.10"
+!define INSTALLER "TorBundle.exe"
+!define WEBSITE "https://www.torproject.org/"
+!define LICENSE "LICENSE"
+ 
+SetCompressor /SOLID BZIP2
+RequestExecutionLevel user
+OutFile ${INSTALLER}
+InstallDir "$LOCALAPPDATA\TorInstPkgs"
+SetOverWrite on
+Name "Tor ${VERSION} Bundle"
+Caption "Tor ${VERSION} Bundle Setup"
+BrandingText "Tor Bundle Installer"
+CRCCheck on
+XPStyle on
+ShowInstDetails hide
+VIProductVersion "${VERSION}"
+VIAddVersionKey "ProductName" "Tor"
+VIAddVersionKey "Comments" "${WEBSITE}"
+VIAddVersionKey "LegalTrademarks" "Three line BSD"
+VIAddVersionKey "LegalCopyright" "©2004-2009, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
+VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
+VIAddVersionKey "FileVersion" "${VERSION}"
+
+!define MUI_ICON "torinst32.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Tor" Tor
+	SectionIn RO
+	SetOutPath $INSTDIR
+	Call ExtractPackages
+        Call RunInstallers
+	Call LaunchVidalia
+SectionEnd
+
+Function ExtractPackages
+	File "tor.msi"
+	File "torbutton.msi"
+	File "thandy.msi"
+	File "polipo.msi"
+	File "vidalia.msi"
+        File "tbcheck.bat"
+FunctionEnd
+
+Function RunInstallers
+	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'
+	ExecWait 'msiexec /i "$INSTDIR\torbutton.msi" /qn'
+	ExecWait 'msiexec /i "$INSTDIR\vidalia.msi" /qn'
+        ExpandEnvStrings $0 %COMSPEC%
+        Exec '"$0" /C "$INSTDIR\tbcheck.bat"'
+FunctionEnd
+
+Function LaunchVidalia
+	SetOutPath "$LOCALAPPDATA\Programs\Vidalia"
+	Exec 'vidalia.exe -loglevel info -logfile log.txt'
+FunctionEnd
+
diff --git a/contrib/netinst.nsi b/contrib/netinst.nsi
new file mode 100644
index 000000000..8e3e53a40
--- /dev/null
+++ b/contrib/netinst.nsi
@@ -0,0 +1,71 @@
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+!include "FileFunc.nsh"
+  
+!define VERSION "0.2.1.10"
+!define INSTALLER "TorNetInstaller.exe"
+!define WEBSITE "https://www.torproject.org/"
+!define LICENSE "LICENSE"
+ 
+SetCompressor /SOLID BZIP2
+RequestExecutionLevel user
+OutFile ${INSTALLER}
+InstallDir "$TEMP\TorInstTmp"
+SetOverWrite on
+Name "Tor Network Installer"
+Caption "Tor Network Installer"
+BrandingText "Tor Network Installer"
+CRCCheck on
+XPStyle on
+ShowInstDetails hide
+VIProductVersion "${VERSION}"
+VIAddVersionKey "ProductName" "Tor"
+VIAddVersionKey "Comments" "${WEBSITE}"
+VIAddVersionKey "LegalTrademarks" "Three line BSD"
+VIAddVersionKey "LegalCopyright" "©2004-2009, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
+VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
+VIAddVersionKey "FileVersion" "${VERSION}"
+
+!define MUI_ICON "torinst32.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Tor" Tor
+	SectionIn RO
+	SetOutPath $INSTDIR
+	Call ExtractPackages
+        Call RunInstallers
+        Call LaunchVidalia
+	Call CleanUpTemp
+SectionEnd
+
+Function ExtractPackages
+	File "thandy.msi"
+FunctionEnd
+
+Function RunInstallers
+	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/'
+	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
+	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update "--repo=$LOCALAPPDATA\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
+	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Tor Updates" /bundleinfo/tor/win32/'
+	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
+	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
+	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
+        ExpandEnvStrings $0 %COMSPEC%
+        Exec '"$0" /C "$INSTDIR\tbcheck.bat"'
+FunctionEnd
+
+Function LaunchVidalia
+	SetOutPath "$LOCALAPPDATA\Programs\Vidalia"
+	Exec 'vidalia.exe -loglevel info -logfile log.txt'
+FunctionEnd
+
+Function CleanUpTemp
+	ExecWait '"del" "$INSTDIR\thandy.msi"'
+	SetOutPath $TEMP
+	RMDir /r $TEMP\TorInstTmp
+FunctionEnd
+
diff --git a/contrib/torinst32.ico b/contrib/torinst32.ico
new file mode 100644
index 0000000000000000000000000000000000000000..ccbad9b152a23ddf7a7caabf99d4d8df017e52d6
GIT binary patch
literal 4286
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
K_>O+to__=G*b=`0

literal 0
HcmV?d00001