From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 14 Nov 2010 22:28:31 +0000 (+0000)
Subject: Move 'FileOpen' command outside from the InstallRetry loop.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a69bc436466b5f993d54ed0a13e6852e407a7882;p=tomcat7.0

Move 'FileOpen' command outside from the InstallRetry loop.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1035088 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index e3732d86e..6f5919ed6 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -195,12 +195,12 @@ Section "Core" SecTomcatCore
     File /oname=tomcat@VERSION_MAJOR@.exe bin\i64\tomcat@VERSION_MAJOR@.exe
   ${EndIf}
 
-  InstallRetry:
   FileOpen $ServiceInstallLog "$INSTDIR\logs\service-install.log" a
   FileSeek $ServiceInstallLog 0 END
+
+  InstallRetry:
   FileWrite $ServiceInstallLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //IS//Tomcat@VERSION_MAJOR@ --DisplayName "Apache Tomcat @VERSION_MAJOR@" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
   FileWrite $ServiceInstallLog "$\r$\n"
-
   ClearErrors
   DetailPrint "Installing Tomcat@VERSION_MAJOR@ service"
   nsExec::ExecToStack '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //IS//Tomcat@VERSION_MAJOR@ --DisplayName "Apache Tomcat @VERSION_MAJOR@" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'