1. There is one more place to fix -- search for "Uninstall.exe" -> lines 350-351.
2. I filed https://issues.apache.org/bugzilla/show_bug.cgi?id=51598 because a user may bypass this trick. Best regards, Konstantin Kolinko 2011/8/1 <ma...@apache.org>: > Author: markt > Date: Mon Aug 1 17:03:56 2011 > New Revision: 1152863 > > URL: http://svn.apache.org/viewvc?rev=1152863&view=rev > Log: > Correctly handle uninstall with the Windows installer of the service is > installed with a name that contains a '-' character. > > Modified: > tomcat/trunk/res/tomcat.nsi > tomcat/trunk/webapps/docs/changelog.xml > > Modified: tomcat/trunk/res/tomcat.nsi > URL: > http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1152863&r1=1152862&r2=1152863&view=diff > ============================================================================== > --- tomcat/trunk/res/tomcat.nsi (original) > +++ tomcat/trunk/res/tomcat.nsi Mon Aug 1 17:03:56 2011 > @@ -1049,7 +1049,7 @@ Function createShortcuts > ${EndIf} > > CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ > $TomcatServiceName\Uninstall Tomcat @VERSION_MAJOR_MINOR@.lnk" \ > - "$INSTDIR\Uninstall.exe" "-ServiceName=$TomcatServiceName" > + "$INSTDIR\Uninstall.exe" '-ServiceName="$TomcatServiceName"' > > CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ > $TomcatServiceName\Tomcat @VERSION_MAJOR_MINOR@ Program Directory.lnk" \ > "$INSTDIR" > > Modified: tomcat/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1152863&r1=1152862&r2=1152863&view=diff > ============================================================================== > --- tomcat/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 1 17:03:56 2011 > @@ -240,6 +240,10 @@ > Simplify mapping for <code>jsp</code> servlet in the default > <code>web.xml</code>. (kkolinko) > </update> > + <fix> > + Correctly handle uninstall with the Windows installer of the service > is > + installed with a name that contains a '-' character. > (markt) > + </fix> > </changelog> > </subsection> > </section> > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
