[vidalia-svn] r3057: Grab the modified Privoxy config.txt from Vidalia's source d (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-09 22:12:31 -0400 (Tue, 09 Sep 2008)
New Revision: 3057

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
Grab the modified Privoxy config.txt from Vidalia's source directory
automatically, rather than making the bundle builder manually copy it
over. Put the original, unmodified config.txt in $INSTDIR but renamed
to config.original. 


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-09-07 18:43:25 UTC (rev 3056)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-09-10 02:12:31 UTC (rev 3057)
@@ -335,7 +335,9 @@
         SectionIn 1 2
         ; add files / whatever that need to be installed here.
         SetOutPath "$INSTDIR\Privoxy"
-        File /r @PRIVOXY_PACKAGE_DIR@\*.*
+        File /r /x @PRIVOXY_PACKAGE_DIR@\config.txt @PRIVOXY_PACKAGE_DIR@\*.*
+        File /nonfatal /oname=config.original @PRIVOXY_PACKAGE_DIR@\config.txt
+        File /oname=config.txt @Vidalia_SOURCE_DIR@\pkg\win32\privoxy.config
 
         WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
         WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"