summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-02-03 17:14:13 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-02-03 17:14:13 +0000
commit8a07ba4d979018a4589ff86d2f2fad78772a340f (patch)
tree69042b1c5abeeca1bc78707c6a8fbd7e91a141d5
parentbdab8a20dd7e23376dcc3215444f1444a9dc0e3b (diff)
downloadrabbitmq-server-8a07ba4d979018a4589ff86d2f2fad78772a340f.tar.gz
Consistency
-rw-r--r--packaging/windows-exe/rabbitmq_nsi.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
index 29e0efcf..575ef7fe 100644
--- a/packaging/windows-exe/rabbitmq_nsi.in
+++ b/packaging/windows-exe/rabbitmq_nsi.in
@@ -25,7 +25,7 @@ InstallDir "$PROGRAMFILES\RabbitMQ Server"
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\RabbitMQ Server" "Install_Dir"
+InstallDirRegKey HKLM "Software\VMware, Inc.\RabbitMQ Server" "Install_Dir"
; Request application privileges for Windows Vista
RequestExecutionLevel admin
@@ -80,7 +80,7 @@ Section "RabbitMQ Server (required)" Rabbit
${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
; Write the installation path into the registry
- WriteRegStr HKLM "SOFTWARE\VMware, Inc.\RabbitMQ" "Install_Dir" "$INSTDIR"
+ WriteRegStr HKLM "SOFTWARE\VMware, Inc.\RabbitMQ Server" "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
WriteRegStr HKLM ${uninstall} "DisplayName" "RabbitMQ Server"
@@ -150,7 +150,7 @@ Section "Uninstall"
; Remove registry keys
DeleteRegKey HKLM ${uninstall}
- DeleteRegKey HKLM "SOFTWARE\VMware, Inc.\RabbitMQ"
+ DeleteRegKey HKLM "SOFTWARE\VMware, Inc.\RabbitMQ Server"
; TODO these will fail if the service is not installed - do we care?
ExpandEnvStrings $0 %COMSPEC%