summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaas Diederichs <claas.diederichs@btc-ag.com>2019-03-22 15:33:46 +0100
committercldieder.btc <claas.diederichs@btc-ag.com>2019-03-23 09:32:17 +0100
commit9cf2efa65980e9f9143a281acf0c3ca74a80a681 (patch)
treea19660c48037f39b0e12a3eb5cbe53ec52a9932c
parent1b87e590a232b878fa1869aff26eef675093a9bc (diff)
downloadrabbitmq-server-git-9cf2efa65980e9f9143a281acf0c3ca74a80a681.tar.gz
Fix issues with forward slashes
Fix issues with forward slashes in RABBITMQ_CONFIG_FILE on windows
-rw-r--r--scripts/rabbitmq-server.bat9
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