remm 2002/06/10 17:27:56
Modified: . tomcat.nsi
Log:
- Fix (non fatal) error message.
Revision Changes Path
1.31 +8 -6 jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tomcat.nsi 18 Feb 2002 09:01:05 -0000 1.30
+++ tomcat.nsi 11 Jun 2002 00:27:56 -0000 1.31
@@ -331,6 +331,7 @@
File /r confinstall
; Build final server.xml
+ Delete "$INSTDIR\conf\server.xml"
FileOpen $R9 "$INSTDIR\conf\server.xml" w
Push "$TEMP\confinstall\server_1.xml"
@@ -341,9 +342,8 @@
FileClose $R9
- CopyFiles "$R9" "$INSTDIR\conf" 18
-
; Build final tomcat-users.xml
+ Delete "$INSTDIR\conf\tomcat-users.xml"
FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
Push "$TEMP\confinstall\tomcat-users_1.xml"
@@ -354,8 +354,6 @@
FileClose $R9
- CopyFiles "$R9" "$INSTDIR\conf" 5
-
; Creating a few shortcuts
IfFileExists "$SMPROGRAMS\Apache Tomcat 4.1" 0 NoLinks
@@ -389,11 +387,15 @@
FileOpen $1 $0 r
- NoError:
+ NoError:
+
FileRead $1 $2
+ IfErrors EOF 0
FileWrite $R9 $2
IfErrors 0 NoError
+
+ EOF:
FileClose $1
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
