[vidalia-svn] r3912: backport r3908 through r3911 for the vidalia-bundle.nsi.in c (vidalia/branches/vidalia-0.1/pkg/win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-06-28 22:20:16 -0400 (Sun, 28 Jun 2009)
New Revision: 3912

Modified:
   vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in
Log:
backport r3908 through r3911 for the vidalia-bundle.nsi.in changes


Modified: vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 02:18:09 UTC (rev 3911)
+++ vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 02:20:16 UTC (rev 3912)
@@ -147,7 +147,6 @@
 ;--------------------------------
 ; Vidalia
 Var configfile
-Var torgeoipfile
 var bInstallVidalia
 SectionGroup "${VIDALIA_DESC}" VidaliaGroup
     ;--------------------------------
@@ -179,10 +178,6 @@
       SetOutPath "$APPDATA\Vidalia"
       File "@Vidalia_SOURCE_DIR@\pkg\geoip-cache"
 
-      ; Include tor's geoip file, too
-      StrCpy $torgeoipfile "geoip"
-      File /oname=$torgeoipfile "@TOR_PACKAGE_DIR@\geoip"
-      
       ;If there's already a torrc config file, ask if they want to
       ;overwrite it with the new one.
       StrCpy $configfile "torrc"
@@ -260,13 +255,12 @@
        IntOp $0 $0 & ${SF_SELECTED}
        IntCmp $0 ${SF_SELECTED} skiptorrc
 
-       ; Include tor's geoip file, too
-       StrCpy $torgeoipfile "geoip"
-       File /oname=$torgeoipfile "@TOR_PACKAGE_DIR@\geoip"
-
        StrCpy $configfile "torrc"
        SetOutPath "$APPDATA\Tor"
 
+       ; Include tor's geoip file, too
+       File "@TOR_PACKAGE_DIR@\geoip"
+
        ; If there's already a torrc config file, ask if they want to
        ; overwrite it with the new one.
        IfFileExists "$APPDATA\Tor\torrc" "" endiftorrc
@@ -328,7 +322,6 @@
           goto torrc_shortcut
         use_tor_torrc:
           StrCpy $configfile "$APPDATA\Tor\torrc"
-          StrCpy $torgeoipfile "$APPDATA\Tor\geoip"
         torrc_shortcut:
           SetShellVarContext all
           CreateShortCut  "${SHORTCUTS}\Tor\Torrc.lnk" "Notepad.exe" $configfile