[vidalia-svn] r4137: More Polipo-related Win32 bundle fixes: actually include the (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-09-29 23:08:28 -0400 (Tue, 29 Sep 2009)
New Revision: 4137

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:

More Polipo-related Win32 bundle fixes: actually include the pre-configured
polipo.conf in the bundle, set SetShellVarContext properly, and update the
ProxyExecutableArguments value written to vidalia.conf with escaped dquotes
so spaces in paths aren't a problem.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-09-29 23:47:32 UTC (rev 4136)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-09-30 03:08:28 UTC (rev 4137)
@@ -339,21 +339,24 @@
         SectionIn 1 2
         ; add files / whatever that need to be installed here.
         SetOutPath "$INSTDIR\Polipo"
-        File /r /x @POLIPO_PACKAGE_DIR@\polipo.conf @POLIPO_PACKAGE_DIR@\*.*
+        SetShellVarContext current
 
-        IntCmp $bInstallVidalia 1 add_to_vidalia_conf skip_vidalia_conf skip_vidalia_conf
-        add_to_vidalia_conf:
-          ; Let Vidalia know that Polipo was installed
+        File /r /x "@POLIPO_PACKAGE_DIR@\polipo.conf" "@POLIPO_PACKAGE_DIR@\*.*"
+        File "@CMAKE_CURRENT_SOURCE_DIR@\polipo.conf"
+
+        ; Let Vidalia know that Polipo was installed
+        IntCmp $bInstallVidalia 1 AddVidaliaSettings SkipVidaliaSettings SkipVidaliaSettings
+        AddVidaliaSettings:
           Push $INSTDIR
           Push "\"
           Push "\\"
           Call StrRep
           Pop $R0
           WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutable "$R0\\Polipo\\${POLIPO_EXEC}"
-          WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments "-c, $R0\\Polipo\\polipo.conf"
+          WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments '-c \"$R0\\Polipo\\polipo.conf\"'
           WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General RunProxyAtStart "true"
+        SkipVidaliaSettings:
 
-        skip_vidalia_conf:
         ; Write the installation path into the registry
         WriteRegStr HKCU SOFTWARE\Polipo "Install_Dir" "$INSTDIR"