aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-10-18 03:47:31 +0000
committerAndrew Lewman <andrew@torproject.org>2006-10-18 03:47:31 +0000
commit21d5040402d8f59dac3ebdc5ee78d69d79035fd1 (patch)
tree93c1652e4cab59fcd433c25239145be318b446d5 /contrib
parentc30a93d4a86219eb1af6aca14c3092d23c9f111d (diff)
downloadtor-21d5040402d8f59dac3ebdc5ee78d69d79035fd1.tar
tor-21d5040402d8f59dac3ebdc5ee78d69d79035fd1.tar.gz
Fix up the strcmp logic to actually display the error message. Include
an explanation for spurious messageboxes for those curious as to their existence svn:r8744
Diffstat (limited to 'contrib')
-rw-r--r--contrib/tor-mingw.nsi.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 1ab247868..f3273084c 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -130,8 +130,10 @@ Section "TorButton for FireFox" Torbutton
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