Author: kkolinko
Date: Wed Aug 24 22:48:01 2011
New Revision: 1161311
URL: http://svn.apache.org/viewvc?rev=1161311&view=rev
Log:
Backport of r1161310
Fix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a
message)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/tomcat.nsi
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 22:48:01 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310
Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1161311&r1=1161310&r2=1161311&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Wed Aug 24 22:48:01 2011
@@ -1091,7 +1091,7 @@ Section Uninstall
MessageBox MB_ICONSTOP|MB_OK \
"No service name specified to uninstall. This will be provided
automatically if you uninstall via \
Add/Remove Programs or the shortcut on the Start menu. Alternatively,
call the installer from \
- the command line with -serviceName=$\"<name of service>$\"."
+ the command line with -ServiceName=$\"<name of service>$\"."
Quit
${EndIf}
@@ -1166,7 +1166,7 @@ SectionEnd
; =================
Function un.onInit
${GetParameters} $R0
- ${GetOPtions} $R0 "-ServiceName=" $R1
+ ${GetOptions} $R0 "-ServiceName=" $R1
StrCpy $TomcatServiceName $R1
StrCpy $TomcatServiceFileName $R1.exe
StrCpy $TomcatServiceManagerFileName $R1w.exe
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
