diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-07-27 15:28:58 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-07-27 15:28:58 +0100 |
| commit | f711ad80282293147ffdf2897bd0544485c8bc9a (patch) | |
| tree | 84913dd51263d01e7182dd5982e60095419ed91f | |
| parent | 994e99d1b457c14212dc78b0152e4b7c19402919 (diff) | |
| download | rabbitmq-server-f711ad80282293147ffdf2897bd0544485c8bc9a.tar.gz | |
Backport 8cd791f3d0af (Merge of bug25035; Windows installer should copy .erlang.cookie more accurately)
| -rw-r--r-- | packaging/windows-exe/rabbitmq_nsi.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in index 91510991..f5257040 100644 --- a/packaging/windows-exe/rabbitmq_nsi.in +++ b/packaging/windows-exe/rabbitmq_nsi.in @@ -101,7 +101,9 @@ Section "RabbitMQ Service" RabbitService ExpandEnvStrings $0 %COMSPEC% ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" install' ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" start' - CopyFiles "$WINDIR\.erlang.cookie" "$PROFILE\.erlang.cookie" + ReadEnvStr $1 "HOMEDRIVE" + ReadEnvStr $2 "HOMEPATH" + CopyFiles "$WINDIR\.erlang.cookie" "$1$2\.erlang.cookie" SectionEnd ;-------------------------------- @@ -234,4 +236,4 @@ Function findErlang System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("ERLANG_HOME", "$0").r0' ${EndIf} -FunctionEnd
\ No newline at end of file +FunctionEnd |