Add extension to default advanced config file name on windows

hairyhum · michaelklishin · commit 211ee2eec98c · 2018-08-28T03:41:49.000+03:00
(cherry picked from commit 721fef6)
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
@@ -194,7 +194,7 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
 CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%
 if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (
     if "!ADVANCED_CONFIG_FILE!"=="" (
-        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced
+        set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced.config
     ) else (
         set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!
     )
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
@@ -190,7 +190,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
    )
 )
 
-REM If $RABBITMQ_LOGS is '-', send all log messages to stdout. This is
+REM If !RABBITMQ_LOGS! is '-', send all log messages to stdout. This is
 REM particularly useful for Docker images.
 
 if "!RABBITMQ_LOGS!" == "-" (

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (`
`194`	`194`	`CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%`
`195`	`195`	`if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (`
`196`	`196`	`if "!ADVANCED_CONFIG_FILE!"=="" (`
`197`		`- set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced`
	`197`	`+ set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced.config`
`198`	`198`	`) else (`
`199`	`199`	`set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!`
`200`	`200`	`)`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (`
`190`	`190`	`)`
`191`	`191`	`)`
`192`	`192`
`193`		`-REM If $RABBITMQ_LOGS is '-', send all log messages to stdout. This is`
	`193`	`+REM If !RABBITMQ_LOGS! is '-', send all log messages to stdout. This is`
`194`	`194`	`REM particularly useful for Docker images.`
`195`	`195`
`196`	`196`	`if "!RABBITMQ_LOGS!" == "-" (`