[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1765: "yesreplace" really meant "noreplace" in the bundle installe (in trunk: . pkg/win32)
Author: edmanm
Date: 2007-06-02 10:20:43 -0400 (Sat, 02 Jun 2007)
New Revision: 1765
Modified:
trunk/
trunk/pkg/win32/vidalia-bundle.nsi
Log:
r1888@adrastea: edmanm | 2007-06-02 10:20:32 -0400
"yesreplace" really meant "noreplace" in the bundle installer, so fix the label.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r1888] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi 2007-06-02 08:44:31 UTC (rev 1764)
+++ trunk/pkg/win32/vidalia-bundle.nsi 2007-06-02 14:20:43 UTC (rev 1765)
@@ -160,13 +160,13 @@
;If there's already a torrc config file, ask if they want to
;overwrite it with the new one.
IfFileExists "$configdir\torrc" "" endiftorrc
- MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO yesreplace
- Delete $configdir\torrc
- Goto endiftorrc
- yesreplace:
- StrCpy $configfile "torrc.sample"
+ MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO noreplace
+ Delete $configdir\torrc
+ Goto endiftorrc
+ noreplace:
+ StrCpy $configfile "torrc.sample"
endiftorrc:
- File /oname=$configfile "tor\${TOR_APPVERSION}\torrc.sample"
+ File /oname=$configfile "tor\${TOR_APPVERSION}\torrc.sample"
; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_DESC}"