From c3becaada04e0596685d65e0f31bf72c8c5f9334 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Tue, 25 Jan 2011 17:57:33 +0000
Subject: Be a bit smarter about what we remove.

---
 packaging/windows-exe/rabbitmq_nsi.in | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'packaging')

diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
index e03a91cb..ab744e7b 100644
--- a/packaging/windows-exe/rabbitmq_nsi.in
+++ b/packaging/windows-exe/rabbitmq_nsi.in
@@ -149,13 +149,12 @@ Section "Uninstall"
   ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
 
   ; Remove files and uninstaller
-  RMDir /r "$INSTDIR"
+  RMDir /r "$INSTDIR\rabbitmq_server-%%VERSION%%"
+  Delete "$INSTDIR\rabbitmq.ico"
+  Delete "$INSTDIR\uninstall.exe"
 
-  ; Remove shortcuts
-  Delete "$SMPROGRAMS\RabbitMQ\*.*"
-
-  ; Remove directories used
-  RMDir "$SMPROGRAMS\RabbitMQ"
+  ; Remove start menu items
+  RMDir /r "$SMPROGRAMS\RabbitMQ"
 
   ; TODO: unset ERLANG_HOME?
 
-- 
cgit v1.2.1