Merge pull request rabbitmq#1509 from rabbitmq/rabbitmq-server-1508

Fix batch file issues with env variables

Author: michaelklishin

scripts/rabbitmq-env.bat

@@ -73,17 +73,16 @@ if not exist "!RABBITMQ_BASE!" (
 for /f "delims=" %%F in ("!RABBITMQ_BASE!") do set RABBITMQ_BASE=%%~sF
 
 REM Check for the short names here too
-if "!RABBITMQ_USE_LONGNAME!"=="" (
-    if "!USE_LONGNAME!"=="" (
-        set RABBITMQ_NAME_TYPE="-sname"
-        set NAMETYPE=shortnames
-    )
-)
-
 if "!RABBITMQ_USE_LONGNAME!"=="true" (
+    set RABBITMQ_NAME_TYPE="-name"
+    set NAMETYPE=longnames
+) else (
     if "!USE_LONGNAME!"=="true" (
         set RABBITMQ_NAME_TYPE="-name"
         set NAMETYPE=longnames
+    ) else (
+        set RABBITMQ_NAME_TYPE="-sname"
+        set NAMETYPE=shortnames
     )
 )
 

scripts/rabbitmq-server.bat

@@ -57,10 +57,10 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co
         -pa "!RABBITMQ_EBIN_ROOT!" ^
         -noinput -hidden ^
         -s rabbit_prelaunch ^
-        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^
-        -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!"  ^
+        -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
-        -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^
+        -rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
+        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
         -extra "!RABBITMQ_NODENAME!"
 
 if ERRORLEVEL 2 (

scripts/rabbitmq-service.bat

@@ -143,8 +143,8 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co
         -s rabbit_prelaunch ^
         -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
-        -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^
-        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!
+        -rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
+        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost
 
 if ERRORLEVEL 3 (
     rem ERRORLEVEL means (or greater) so we need to catch all other failure