diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2019-03-25 10:26:04 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2019-03-25 10:26:04 -0700 |
| commit | 4a441248c9b5544e5569f799ca0d93ec7541266e (patch) | |
| tree | ea18671c973ec8a0c746b17c14689be57c48748e /scripts/rabbitmq-server.bat | |
| parent | 57b72757334a2493d5e10f3529ab9895947b860a (diff) | |
| download | rabbitmq-server-git-4a441248c9b5544e5569f799ca0d93ec7541266e.tar.gz | |
Rename function to convert forward slashes, use it in another place
Diffstat (limited to 'scripts/rabbitmq-server.bat')
| -rw-r--r-- | scripts/rabbitmq-server.bat | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 4b4a92b72c..d070df7a92 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -48,8 +48,7 @@ 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 :convert_forward_slashes !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!" (
@@ -61,8 +60,7 @@ 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 :convert_forward_slashes !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE
CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX
if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (
@@ -104,6 +102,7 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE!" ( )
)
+CALL :convert_forward_slashes !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE
CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
if not "!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (
@@ -283,11 +282,13 @@ EXIT /B 0 set "%~2=%~dpn1"
EXIT /B 0
-:get_localized
+rem Convert unix style path separators into windows style path separators
+rem needed for comparing with _NOEX variables
+rem rabbitmq/rabbitmq-server#1962
+:convert_forward_slashes
set "%~2=%~dpf1"
EXIT /B 0
-
endlocal
endlocal
endlocal
|