[or-cvs] In tor.nsi, replace all +N for N!=2 with actual labels. Ap...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/contrib
In directory moria:/tmp/cvs-serv969/contrib

Modified Files:
	tor.nsi 
Log Message:
In tor.nsi, replace all +N for N!=2 with actual labels.  Apparently, the NSI designers understand that languages have been written since 6502 assembler, but just want to retain backward compatibility for people who never learned them.

Index: tor.nsi
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/tor.nsi,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- tor.nsi	4 Aug 2005 19:22:53 -0000	1.50
+++ tor.nsi	4 Aug 2005 20:47:45 -0000	1.51
@@ -103,11 +103,13 @@
    SetOutPath $configdir
    ;If there's already a torrc config file, ask if they want to
    ;overwrite it with the new one.
-   IfFileExists "$configdir\torrc" "" +5
-      MessageBox MB_ICONQUESTION|MB_YESNO "You already have a Tor config file.$\r$\nDo you want to overwrite it with the default sample config file?" IDNO +3
+   IfFileExists "$configdir\torrc" "" endiftorrc
+      MessageBox MB_ICONQUESTION|MB_YESNO "You already have a Tor config file.$\r$\nDo you want to overwrite it with the default sample config file?" IDNO yesreplace
       Delete $configdir\torrc
-      Goto +2
-         StrCpy $configfile "torrc.sample"
+      Goto endiftorrc
+     yesreplace:
+      StrCpy $configfile "torrc.sample"
+   endiftorrc:
    File /oname=$configfile "..\src\config\torrc.sample"
 SectionEnd
 
@@ -146,11 +148,12 @@
    CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
    CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor Website.url"
    CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-   IfFileExists "$INSTDIR\Documents\*.*" "" +5
+   IfFileExists "$INSTDIR\Documents\*.*" "" endifdocs
       CreateDirectory "$SMPROGRAMS\Tor\Documents"
       CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-doc.html"
       CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Documents"
       CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Documents\tor-spec.txt"
+   endifdocs:
 SectionEnd
 
 Section "Desktop" Desktop