[vidalia-svn] r3918: backport r3913; edmanm's if-statement fix (vidalia/branches/vidalia-0.1/pkg/win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-06-28 23:01:25 -0400 (Sun, 28 Jun 2009)
New Revision: 3918

Modified:
   vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in
Log:
backport r3913; edmanm's if-statement fix


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:55:02 UTC (rev 3917)
+++ vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 03:01:25 UTC (rev 3918)
@@ -248,7 +248,10 @@
        File "@TOR_PACKAGE_DIR@\tor.exe"
        File "@TOR_PACKAGE_DIR@\tor-resolve.exe"
        WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "https://www.torproject.org";
-
+       ; Include tor's geoip file, too
+       SetOutPath "$APPDATA\Tor"
+       File "@TOR_PACKAGE_DIR@\geoip"
+       
        ; If the user is also installing Vidalia, then don't confuse them by
        ; an extra torrc in %APPDATA%\Tor
        SectionGetFlags ${Vidalia} $0
@@ -256,11 +259,7 @@
        IntCmp $0 ${SF_SELECTED} skiptorrc
 
        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