3 files changed, 11 insertions, 9 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 19b20a4680..71752c667f 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -172,11 +172,12 @@ 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
     ) else (
-        set RABBITMQ_ADVANCED_CONFIG_FILE=!GENERATED_CONFIG_DIR!
+        set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!
     )
 )
 
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 8718197471..d87dc9d5fb 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -42,9 +42,9 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 
 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
 
-for %%NOEX in (CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE!) do RABBITMQ_ADVANCED_CONFIG_FILE_NOEX=%%NOEX
+CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX
 if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (
-    RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!
+    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!
 )
 
 "!ERLANG_HOME!\bin\erl.exe" ^
@@ -71,7 +71,7 @@ if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
 
 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"
 
-for %%NOEX in (CALL :get_noex !RABBITMQ_CONFIG_FILE!) do RABBITMQ_CONFIG_FILE_NOEX=%%NOEX
+CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX
 
 if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (
     if exist "!RABBITMQ_CONFIG_FILE!" (
@@ -183,7 +183,7 @@ if "%~2"=="" (
 EXIT /B 0
 
 :get_noex
-echo %~dpn1
+set "%~2=%~dpn1"
 EXIT /B 0
 
 endlocal
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index ed1829c0d6..8433362672 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -126,9 +126,10 @@ set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
 
 set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"
 
-for %%NOEX in (CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE!) do RABBITMQ_ADVANCED_CONFIG_FILE_NOEX=%%NOEX
+CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX
+
 if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (
-    RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!
+    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!
 )
 
 "!ERLANG_HOME!\bin\erl.exe" ^
@@ -161,7 +162,7 @@ if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
     echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!.config
 )
 
-for %%NOEX in (CALL :get_noex !RABBITMQ_CONFIG_FILE!) do RABBITMQ_CONFIG_FILE_NOEX=%%NOEX
+CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX
 
 if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (
     if exist "!RABBITMQ_CONFIG_FILE!" (
@@ -293,7 +294,7 @@ if "%~2"=="" (
 EXIT /B 0
 
 :get_noex
-echo %~dpn1
+set "%~2=%~dpn1"
 EXIT /B 0
 
 endlocal