diff options
| author | Tim Watson <watson.timothy@gmail.com> | 2014-01-10 17:07:46 +0000 |
|---|---|---|
| committer | Tim Watson <watson.timothy@gmail.com> | 2014-01-10 17:07:46 +0000 |
| commit | 8c4feedd9c119240cfe1d24977e3183edde657d7 (patch) | |
| tree | 5ceacfcd59b7a4342ecc219f17c279ef751a8f97 /scripts | |
| parent | 8b397e93f589e6c57182b76e941cc02274656885 (diff) | |
| parent | d31640186232bdab187deafdf4885aaae685df66 (diff) | |
| download | rabbitmq-server-git-8c4feedd9c119240cfe1d24977e3183edde657d7.tar.gz | |
Merge default into bug24926
Merge conflicts in rabbit.erl, pertaining to app startup procedure.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index d36b130c12..8c350f7aad 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -22,9 +22,17 @@ rem enabling delayed expansion set TN0=%~n0
set TDP0=%~dp0
set P1=%1
-set STAR=%*
setlocal enabledelayedexpansion
+set STARVAR=
+shift
+:loop1
+if "%1"=="" goto after_loop
+ set STARVAR=%STARVAR% %1
+ shift
+goto loop1
+:after_loop
+
if "!RABBITMQ_SERVICENAME!"=="" (
set RABBITMQ_SERVICENAME=RabbitMQ
)
@@ -200,7 +208,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -os_mon start_memsup false ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
!RABBITMQ_SERVER_START_ARGS! ^
-!STAR!
+!STARVAR!
set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!
set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!
|