diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-04 11:46:37 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-04 11:47:39 +0100 |
| commit | 5ebcb9b437940289b2a133d9d9c890124c2e176c (patch) | |
| tree | 6ec253d1f4e023135d82edaf73432c107a423393 | |
| parent | c5e029bcc30df26417c65688e5f2fd32b74a3d73 (diff) | |
| download | rabbitmq-server-git-5ebcb9b437940289b2a133d9d9c890124c2e176c.tar.gz | |
Unquoting and extension trimming in windows scripts
| -rw-r--r-- | scripts/rabbitmq-env.bat | 3 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 9 |
3 files changed, 11 insertions, 9 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index c29ef5d5cc..6ec8373f4c 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -168,11 +168,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
|