Correct how to refer to environment variables.bug18626

4 files changed, 6 insertions, 6 deletions

diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index 1fc0e733..1ed648b0 100755
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -63,7 +63,7 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
     set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

 )

 

-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden %RABBITMQ_NAME_TYPE% rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR!

+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_NAME_TYPE! rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR!

 

 endlocal

 endlocal

diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 1be96d52..4fdb73b7 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -112,7 +112,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
         -pa "!RABBITMQ_EBIN_ROOT!" ^

         -noinput -hidden ^

         -s rabbit_prelaunch ^

-        %RABBITMQ_NAME_TYPE% rabbitmqprelaunch!RANDOM!!TIME:~9! ^

+        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^

         -extra "!RABBITMQ_NODENAME!"

 

 if ERRORLEVEL 2 (

@@ -148,7 +148,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 -boot start_sasl ^

 -s rabbit boot ^

 !RABBITMQ_CONFIG_ARG! ^

-%RABBITMQ_NAME_TYPE% !RABBITMQ_NODENAME! ^

+!RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^

 +W w ^

 +A30 ^

 +P 1048576 ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 73aa3c52..c5896b59 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -192,7 +192,7 @@ if "!RABBITMQ_CONFIG_FILE!"=="" (
         -pa "!RABBITMQ_EBIN_ROOT!" ^

         -noinput -hidden ^

         -s rabbit_prelaunch ^

-        %RABBITMQ_NAME_TYPE% rabbitmqprelaunch!RANDOM!!TIME:~9!

+        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!

 

 if ERRORLEVEL 3 (

     rem ERRORLEVEL means (or greater) so we need to catch all other failure

@@ -255,7 +255,7 @@ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!
 -env ERL_CRASH_DUMP="!RABBITMQ_BASE:\=/!/erl_crash.dump" ^

 -workdir "!RABBITMQ_BASE!" ^

 -stopaction "rabbit:stop_and_halt()." ^

-%RABBITMQ_NAME_TYPE% !RABBITMQ_NODENAME! ^

+!RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^

 !CONSOLE_FLAG! ^

 -comment "A robust and scalable messaging broker" ^

 -args "!ERLANG_SERVICE_ARGUMENTS!" > NUL

diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index c549dd59..6eb2530a 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -65,7 +65,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 

 rem rabbitmqctl starts distribution itself, so we need to make sure epmd

 rem is running.

-"!ERLANG_HOME!\bin\erl.exe" %RABBITMQ_NAME_TYPE% rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -noinput -eval "erlang:halt()."

+"!ERLANG_HOME!\bin\erl.exe" !RABBITMQ_NAME_TYPE! rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -noinput -eval "erlang:halt()."

 

 "!ERLANG_HOME!\bin\erl.exe" ^

 -pa "!TDP0!..\ebin" ^