Changeset 2469 for vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in

Timestamp:

03/29/08 20:49:47 (9 months ago)

Author:

phobos

Message:

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.

Files:

• vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in (modified) (3 diffs)

vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in

@@ -25 +25 @@
 !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}"
 
@@ -34 +34 @@
 
 !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}"
 
@@ -400 +400 @@
     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: