diff options
Diffstat (limited to 'contrib/tor-mingw.nsi.in')
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index fcc2033cb8..5cc2e39465 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -1,6 +1,6 @@ ;tor.nsi - A basic win32 installer for Tor ; Originally written by J Doe. -; Modified by Steve Topletz +; Modified by Steve Topletz, Andrew Lewman ; See the Tor LICENSE for licensing information ;----------------------------------------- ; @@ -96,6 +96,11 @@ Section "Tor" Tor Next: ${EndIf} File /oname=$CONFIGFILE "..\src\config\torrc.sample" + +; the geoip file needs to be included and stuffed into the right directory +; otherwise tor is unhappy + SetOutPath $APPDATA\Tor + Call ExtractGEOIP SectionEnd Section "Documents" Docs @@ -113,7 +118,6 @@ Section "Start Menu" StartMenu ${If} ${FileExists} "$INSTDIR\Documents\*.*" Call CreateDocLinks ${EndIf} - endifdocs: SectionEnd Section "Desktop" Desktop @@ -156,12 +160,15 @@ Function ExtractBinaries File "${BIN}\tor-resolve.exe" FunctionEnd +Function ExtractGEOIP + File "${BIN}\geoip" +FunctionEnd + Function ExtractIcon File "${BIN}\tor.ico" FunctionEnd Function ExtractSpecs - ;File "doc\FAQ" File "..\doc\HACKING" File "..\doc\spec\address-spec.txt" File "..\doc\spec\control-spec.txt" @@ -209,6 +216,7 @@ Function un.InstallFiles Delete "$INSTDIR\tor.ico" Delete "$SMSTARTUP\Tor.lnk" Delete "$INSTDIR\Uninstall.exe" + Delete "$INSTDIR\geoip" FunctionEnd Function un.InstallDirectories |