Author: kkolinko
Date: Thu Oct 20 12:36:07 2011
New Revision: 1186763
URL: http://svn.apache.org/viewvc?rev=1186763&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
Delete Tomcat key from HKLM branch of Windows Registry on deinstallation.
The bug affects 32-bit systems only.
The code for 64-bit registry a few lines below is OK.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1186763&r1=1186762&r2=1186763&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Oct 20 12:36:07 2011
@@ -1108,7 +1108,7 @@ Section Uninstall
; Don't know if 32-bit or 64-bit registry was used so, for now, remove both
SetRegView 32
DeleteRegKey HKLM
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat
@VERSION_MAJOR_MINOR@ $TomcatServiceName"
- DeleteRegKey HKLM "SOFTWARE\Apache Software
Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software
Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName"
DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
SetRegView 64
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
