[vidalia-svn] r2469: Update the win32 bundle nsi to include current versions of t (vidalia/trunk/pkg/win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-03-29 20:49:47 -0400 (Sat, 29 Mar 2008)
New Revision: 2469

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
Update the win32 bundle nsi to include current versions of tor and
torbutton.  Change the torbutton installer to work the same as OSX and
the way mozilla intended.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-03-30 00:45:17 UTC (rev 2468)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-03-30 00:49:47 UTC (rev 2469)
@@ -24,7 +24,7 @@
 
 !define TOR_NAME            "Tor"
 !define TOR_EXEC            "tor.exe"
-!define TOR_APPVERSION      "0.2.0.12-alpha"
+!define TOR_APPVERSION      "0.2.0.23-rc"
 !define TOR_DESC            "${TOR_NAME} ${TOR_APPVERSION}"
 
 !define PRIVOXY_NAME        "Privoxy"
@@ -33,7 +33,7 @@
 !define PRIVOXY_DESC        "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
 
 !define TORBUTTON_NAME      "Torbutton"
-!define TORBUTTON_APPVERSION "1.1.9.1-alpha"
+!define TORBUTTON_APPVERSION "1.1.17-alpha"
 !define TORBUTTON_DESC      "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
 
 !define BUNDLE_NAME         "Vidalia Bundle"
@@ -399,7 +399,7 @@
     SectionIn 1 2
     ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" ""
     StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
-	  Exec '"$1" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
+	  Exec '"$1" "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
   	Goto TorbuttonInstalled
     FirefoxNotFound:
 	  MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"