From 0dd1a7f121bebcd6292f4cbd3bc91155e6bd2713 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 4 Aug 2005 20:47:45 +0000 Subject: [PATCH] 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. svn:r4696 --- contrib/tor.nsi | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/tor.nsi b/contrib/tor.nsi index 38f6cc5679..89fd5c6efd 100644 --- a/contrib/tor.nsi +++ b/contrib/tor.nsi @@ -103,11 +103,13 @@ Section "Tor" Tor 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 @@ Section "Start Menu" StartMenu 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