[vidalia-svn] r4130: Tweaks to the bundle NSIS installer to only add the Polipo-r (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-09-23 17:31:32 -0400 (Wed, 23 Sep 2009)
New Revision: 4130

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

Tweaks to the bundle NSIS installer to only add the Polipo-related lines
to vidalia.conf if Vidalia is installed and to only try to start Polipo
and Tor with "Run installed components" at the end if Vidalia *isn't*
installed as well.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-09-23 20:46:42 UTC (rev 4129)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-09-23 21:31:32 UTC (rev 4130)
@@ -201,11 +201,7 @@
       Pop $R0 ; contains the modified version of $INSTDIR
       WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
       WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)"
-      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 RunProxyAtStart "true"
 
-
       ; Write the uninstall keys for Windows  
       SetShellVarContext all
       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
@@ -345,6 +341,19 @@
         SetOutPath "$INSTDIR\Polipo"
         File /r /x @POLIPO_PACKAGE_DIR@\polipo.conf @POLIPO_PACKAGE_DIR@\*.*
 
+        IntCmp $bInstallVidalia 1 add_to_vidalia_conf setup_polipo_reg_keys setup_polipo_reg_keys
+        add_to_vidalia_conf:
+          ; Let Vidalia know that Polipo was installed
+          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 RunProxyAtStart "true"
+
+        skip_vidalia_conf:
         ; Write the installation path into the registry
         WriteRegStr HKCU SOFTWARE\Polipo "Install_Dir" "$INSTDIR"
 
@@ -463,7 +472,7 @@
     IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
     run_vidalia:
         Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
-        goto check_polipo
+        goto done
     
     check_tor:
     IntCmp $bInstallTor 1 run_tor check_polipo check_polipo
@@ -474,7 +483,7 @@
     IntCmp $bInstallPolipo 1 run_polipo done done
     run_polipo:
         SetOutPath "$INSTDIR\Polipo"
-        ExecShell "" '"$INSTDIR\Polipo\${POLIPO_EXEC}"' "" SW_SHOWMINIMIZED
+        Exec '"$INSTDIR\Polipo\${POLIPO_EXEC}" -c "$INSTDIR\Polipo\polipo.conf"'
     done:
 FunctionEnd