From 1bc0935572833816fe2c46801735bd06e4bb11f1 Mon Sep 17 00:00:00 2001 From: Emile Joubert Date: Mon, 17 Oct 2011 14:44:29 +0100 Subject: Windows slashes --- scripts/rabbitmq-server.bat | 12 +++++------- scripts/rabbitmq-service.bat | 13 +++++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 3c3fcbbc..c27b418a 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -57,13 +57,11 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( exit /B ) -set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/! - if "!RABBITMQ_MNESIA_BASE!"=="" ( - set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db + set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE!/db ) if "!RABBITMQ_LOG_BASE!"=="" ( - set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log + set RABBITMQ_LOG_BASE=!RABBITMQ_BASE!/log ) @@ -85,7 +83,7 @@ if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" ( ) if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" ( - set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!/enabled_plugins + set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins ) set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins @@ -101,7 +99,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^ "!RABBITMQ_NODENAME!" -set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!/rabbit +set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit if ERRORLEVEL 1 ( exit /B 1 ) @@ -109,7 +107,7 @@ if ERRORLEVEL 1 ( set RABBITMQ_EBIN_PATH= if "!RABBITMQ_CONFIG_FILE!"=="" ( - set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!/rabbitmq + set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq ) if exist "!RABBITMQ_CONFIG_FILE!.config" ( diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 140d8955..4d3fce49 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -89,14 +89,11 @@ if not exist "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" ( exit /B 1 ) -rem erlang prefers forwardslash as separator in paths -set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/! - if "!RABBITMQ_MNESIA_BASE!"=="" ( - set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db + set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE!/db ) if "!RABBITMQ_LOG_BASE!"=="" ( - set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log + set RABBITMQ_LOG_BASE=!RABBITMQ_BASE!/log ) @@ -169,7 +166,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^ "" -set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!/rabbit +set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit if ERRORLEVEL 1 ( exit /B 1 ) @@ -177,7 +174,7 @@ if ERRORLEVEL 1 ( set RABBITMQ_EBIN_PATH= if "!RABBITMQ_CONFIG_FILE!"=="" ( - set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!/rabbitmq + set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq ) if exist "!RABBITMQ_CONFIG_FILE!.config" ( @@ -219,7 +216,7 @@ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"! "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" set !RABBITMQ_SERVICENAME! ^ -machine "!ERLANG_SERVICE_MANAGER_PATH!\erl.exe" ^ --env ERL_CRASH_DUMP="!RABBITMQ_BASE_UNIX!/erl_crash.dump" ^ +-env ERL_CRASH_DUMP="!RABBITMQ_BASE:\=/!/erl_crash.dump" ^ -workdir "!RABBITMQ_BASE!" ^ -stopaction "rabbit:stop_and_halt()." ^ -sname !RABBITMQ_NODENAME! ^ -- cgit v1.2.1