[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8744: Fix up the strcmp logic to actually display the error messag (tor/trunk/contrib)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r8744: Fix up the strcmp logic to actually display the error messag (tor/trunk/contrib)
- From: phobos@xxxxxxxx
- Date: Tue, 17 Oct 2006 23:47:34 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 17 Oct 2006 23:47:45 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: phobos
Date: 2006-10-17 23:47:31 -0400 (Tue, 17 Oct 2006)
New Revision: 8744
Modified:
tor/trunk/contrib/tor-mingw.nsi.in
Log:
Fix up the strcmp logic to actually display the error message. Include
an explanation for spurious messageboxes for those curious as to their
existence
Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in 2006-10-18 03:31:13 UTC (rev 8743)
+++ tor/trunk/contrib/tor-mingw.nsi.in 2006-10-18 03:47:31 UTC (rev 8744)
@@ -130,8 +130,10 @@
File "${BIN}\torbutton-1.0.4-fx+tb.xpi"
ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
+ ; This message box is for debugging
MessageBox MB_OK "Firefox is installed at $1"
- StrCmp $1 "" +1 0
+ StrCmp $1 "" +4 0 ; if Path is empty or null, then skip to an error, otherwise proceed normally
+ ; This message box is for debugging
MessageBox MB_OK "I'm going to run $1firefox.exe --install-global-extension $INSTDIR\torbutton"
Exec '"$1firefox.exe" -install-global-extension $INSTDIR\torbutton-1.0.4-fx+tb.xpi'
Goto +2