[vidalia-svn] r1827: Use the (Default) key under "HKLM\SOFTWARE\Microsoft\Windows (trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-08 11:17:46 -0400 (Wed, 08 Aug 2007)
New Revision: 1827

Modified:
   trunk/pkg/win32/vidalia-bundle.nsi
Log:
Use the (Default) key under "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\App
Paths\firefox.exe" for finding out where firefox.exe lives instead of "Path",
so we don't care whether the user's Firefox includes a slash or not at the end of
its "Path" key.


Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi	2007-08-07 14:50:38 UTC (rev 1826)
+++ trunk/pkg/win32/vidalia-bundle.nsi	2007-08-08 15:17:46 UTC (rev 1827)
@@ -397,9 +397,9 @@
 
   Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
     SectionIn 1 2
-    ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
+    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 '"$1firefox.exe" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
+	  Exec '"$1" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
   	Goto TorbuttonInstalled
     FirefoxNotFound:
 	  MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"