[vidalia-svn] r3909: remove the extra tor geoip copy, put the geoip file into the (vidalia/trunk/pkg/win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-06-28 22:07:02 -0400 (Sun, 28 Jun 2009)
New Revision: 3909

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
remove the extra tor geoip copy, put the geoip file into the correct
outpath


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 01:51:01 UTC (rev 3908)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 02:07:02 UTC (rev 3909)
@@ -179,10 +179,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 +256,13 @@
        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
+       StrCpy $torgeoipfile "geoip"
+       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