Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv30154
Modified Files:
installer.nsi
Log Message:
Installer no longer uses hard-coded POP3 separator character (uses data from popfile.cfg, if present)
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** installer.nsi 6 May 2003 22:58:04 -0000 1.42
--- installer.nsi 8 May 2003 16:41:26 -0000 1.43
***************
*** 732,735 ****
--- 732,774 ----
; etc
+ !define L_LNE $R9
+ !define L_SEPARATOR $R8
+ !define L_TEMP $R3
+
+ StrCpy ${L_SEPARATOR} ""
+
+ ClearErrors
+
+ FileOpen ${CFG} $INSTDIR\popfile.cfg r
+
+ loop:
+ FileRead ${CFG} ${L_LNE}
+ IfErrors separator_done
+
+ StrCpy ${L_TEMP} ${L_LNE} 10
+ StrCmp ${L_TEMP} "separator " old_separator
+ StrCpy ${L_TEMP} ${L_LNE} 15
+ StrCmp ${L_TEMP} "pop3_separator " new_separator
+ Goto loop
+
+ old_separator:
+ StrCpy ${L_SEPARATOR} ${L_LNE} 1 10
+ Goto loop
+
+ new_separator:
+ StrCpy ${L_SEPARATOR} ${L_LNE} 1 15
+ Goto loop
+
+ separator_done:
+ Push ${L_SEPARATOR}
+ Call TrimNewlines
+ Pop ${L_SEPARATOR}
+
+ ; Use separator character from popfile.cfg (if present) otherwise use a semicolon
+
+ StrCmp ${L_SEPARATOR} "" 0 check_accounts
+ StrCpy ${L_SEPARATOR} ":"
+
+ check_accounts:
StrCpy ${OEID} 0
***************
*** 823,827 ****
FileClose ${CFG}
! WriteRegStr HKCU $R5 "POP3 User Name" "$R7:$R6"
WriteRegStr HKCU $R5 "POP3 Server" "127.0.0.1"
--- 862,866 ----
FileClose ${CFG}
! WriteRegStr HKCU $R5 "POP3 User Name" "$R7${L_SEPARATOR}$R6"
WriteRegStr HKCU $R5 "POP3 Server" "127.0.0.1"
***************
*** 836,839 ****
--- 875,882 ----
finished_oe:
+
+ !undef L_LNE
+ !undef L_SEPARATOR
+ !undef L_TEMP
FunctionEnd
|
