directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r671105 - /directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi
Date Tue, 24 Jun 2008 09:48:24 GMT
Author: pamarcelot
Date: Tue Jun 24 02:48:24 2008
New Revision: 671105

URL: http://svn.apache.org/viewvc?rev=671105&view=rev
Log:
Fix for DIRESERVER-1188 (Windows Installer corrupts Windows when uninstalling).

Modified:
    directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi

Modified: directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi?rev=671105&r1=671104&r2=671105&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi
(original)
+++ directory/installers/branches/bigbang/apacheds/src/main/installers/apacheds-server-win.nsi
Tue Jun 24 02:48:24 2008
@@ -180,7 +180,6 @@
     Call ReplaceInFile
 
   ;Store install folder
-  WriteRegStr HKLM "SOFTWARE\${Vendor}\${Project}\Server" "InstallDir" $SERVER_HOME_DIR
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server"
"DisplayName" "${Project} Server - (remove only)"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server"
"DisplayIcon" "$SERVER_HOME_DIR\uninstall.exe"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Project} Server"
"UninstallString" '"$SERVER_HOME_DIR\uninstall.exe"'
@@ -443,7 +442,6 @@
 ;Uninstaller Section
 
 Section "Uninstall"
-  ReadRegStr $SERVER_HOME_DIR HKLM "SOFTWARE\${Vendor}\${Project}\Server" "InstallDir"
 
   ; Need to parse a list of instances or directories somehow
   Push "default"
@@ -457,12 +455,12 @@
   RMDir /r "$SMPROGRAMS\Apache Directory Suite\Server"
 
   ; remove files in root, then all dirs created by the installer.... leave user added or
instance dirs.
-  Delete "$SERVER_HOME_DIR\*"
-  RMDir /r "$SERVER_HOME_DIR\bin"
-  RMDir /r "$SERVER_HOME_DIR\conf"
-  RMDir /r "$SERVER_HOME_DIR\var"
-  RMDir /r "$SERVER_HOME_DIR\lib"
-  RMDir /r "$SERVER_HOME_DIR\log"
+  Delete "$INSTDIR\*"
+  RMDir /r "$INSTDIR\bin"
+  RMDir /r "$INSTDIR\conf"
+  RMDir /r "$INSTDIR\var"
+  RMDir /r "$INSTDIR\lib"
+  RMDir /r "$INSTDIR\log"
 
 SectionEnd
 



Mime
View raw message