diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2019-03-25 10:14:28 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2019-03-25 10:14:28 -0700 |
| commit | 57b72757334a2493d5e10f3529ab9895947b860a (patch) | |
| tree | b3e8ebf05c810164ca63bf6fc23318d48a05d780 /scripts/rabbitmq-server.bat | |
| parent | 6e54d77439e2466ea41f0cbf2fc9600f02467157 (diff) | |
| parent | 9cf2efa65980e9f9143a281acf0c3ca74a80a681 (diff) | |
| download | rabbitmq-server-git-57b72757334a2493d5e10f3529ab9895947b860a.tar.gz | |
Merge remote-tracking branch 'gh-1962/master' into rabbitmq-server-1962
Diffstat (limited to 'scripts/rabbitmq-server.bat')
| -rw-r--r-- | scripts/rabbitmq-server.bat | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 27d0037f7b..4b4a92b72c 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -48,6 +48,8 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
+rem convert unix style path seperators into windows style path seperators, needed for comparing with _NOEX variables
+CALL :get_localized !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE
CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX
if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" (
@@ -59,6 +61,8 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" ( )
)
+rem convert unix style path seperators into windows style path seperators, needed for comparing with _NOEX variables
+CALL :get_localized !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE
CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX
if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (
@@ -279,6 +283,11 @@ EXIT /B 0 set "%~2=%~dpn1"
EXIT /B 0
+:get_localized
+set "%~2=%~dpf1"
+EXIT /B 0
+
+
endlocal
endlocal
endlocal
|