From 45d0f1ecdee33a06fbc1b6790222237a19a48799 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Tue, 12 Jun 2007 06:51:55 +0000
Subject: [PATCH] INSTALLER: improve uninstall

bzr revid: ced-7abf099add860e51965152a0d9d35323a8648e9f
---
 tinyerp-server-installer.nsi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tinyerp-server-installer.nsi b/tinyerp-server-installer.nsi
index f44b546989e..a1206ecc92b 100644
--- a/tinyerp-server-installer.nsi
+++ b/tinyerp-server-installer.nsi
@@ -38,6 +38,7 @@
 ;Pages
 
   !define MUI_ICON ".\pixmaps\tinyerp.ico"
+  !define MUI_UNICON ".\pixmaps\tinyerp.ico"
   !define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\tinyerp-intro.bmp"
   !define MUI_HEADERIMAGE
   !define MUI_HEADERIMAGE_BITMAP ".\pixmaps\tinyerp-header.bmp"
@@ -97,6 +98,8 @@ Section "TinyERP Server" SecTinyERPServer
   WriteRegStr HKCU "Software\TinyERP Server" "" $INSTDIR
   
   ;Create uninstaller
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TinyERP Server" "DisplayName" "TinyERP Server (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TinyERP Server" "UninstallString" "$INSTDIR\Uninstall.exe"
   WriteUninstaller "$INSTDIR\Uninstall.exe"
   
 
@@ -105,7 +108,6 @@ Section "TinyERP Server" SecTinyERPServer
     ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\TinyERP Server.lnk" "$INSTDIR\tinyerp-server.exe"
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start service.lnk" "$INSTDIR\service\start.bat"
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop service.lnk" "$INSTDIR\service\stop.bat"
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit config.lnk" "notepad.exe" "$INSTDIR\tinyerp-server.conf"
@@ -174,6 +176,7 @@ Section "Uninstall"
     StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
   startMenuDeleteLoopDone:
 
+  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TinyERP Server"
   DeleteRegKey /ifempty HKCU "Software\TinyERP Server"
 
 SectionEnd