mturk 2004/09/13 12:11:41 Modified: . tomcat.nsi Log: Check the return value from service install and give user a chance to fix the problems, ignore or abort installation. The problems can be either the lack of admin permission or the service Tomcat5 already installed. Revision Changes Path 1.60 +11 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- tomcat.nsi 9 Sep 2004 21:51:20 -0000 1.59 +++ tomcat.nsi 13 Sep 2004 19:11:41 -0000 1.60 @@ -157,7 +157,16 @@ DetailPrint "Using Jvm: $2" + InstallRetry: + ClearErrors nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat5.exe" --Jvm "$2"' + Pop $0 + StrCmp $0 "0" InstallOk + MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \ + "Failed to install Tomcat5 service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \ + /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry + Quit + InstallOk: ClearErrors SectionEnd @@ -353,7 +362,7 @@ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "JavaHome" ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "RuntimeLib" - FoundJDK: + ;FoundJDK: IfErrors 0 NoErrors StrCpy $1 ""
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]