diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 16 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 3 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 |
5 files changed, 21 insertions, 10 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index f1624eddf9..d74a3b173a 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -270,10 +270,14 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then eval $( (${RABBITMQ_SCRIPTS_DIR}/rabbitmqctl eval \ '{ok, P} = application:get_env(rabbit, plugins_dir), {ok, E} = application:get_env(rabbit, enabled_plugins_file), + B = os:getenv("RABBITMQ_MNESIA_BASE"), + M = os:getenv("RABBITMQ_MNESIA_DIR"), io:format( "plugins_dir=\"~s\"~n" - "enabled_plugins_file=\"~s\"~n", [P, E]).' \ - 2>/dev/null | head -n 2) || :) + "enabled_plugins_file=\"~s\"~n" + "mnesia_base=\"~s\"~n" + "mnesia_dir=\"~s\"~n", [P, E, B, M]).' \ + 2>/dev/null | head -n 4) || :) if [ "${plugins_dir}" -a \ "$RABBITMQ_PLUGINS_DIR_source" != 'environment' ]; then RABBITMQ_PLUGINS_DIR="${plugins_dir}" @@ -282,6 +286,14 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then "$RABBITMQ_ENABLED_PLUGINS_FILE_source" != 'environment' ]; then RABBITMQ_ENABLED_PLUGINS_FILE="${enabled_plugins_file}" fi + if [ "${mnesia_base}" -a \ + "$RABBITMQ_MNESIA_BASE_source" != 'environment' ]; then + RABBITMQ_MNESIA_BASE="${mnesia_base}" + fi + if [ "${mnesia_dir}" -a \ + "$RABBITMQ_MNESIA_DIR_source" != 'environment' ]; then + RABBITMQ_MNESIA_DIR="${mnesia_dir}" + fi fi if path_contains_existing_directory "${RABBITMQ_PLUGINS_DIR}" ; then diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 9d7a724318..e3fddbb3eb 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -202,7 +202,6 @@ if "!RABBITMQ_SCHEMA_DIR!" == "" ( )
)
-
REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
if "!RABBITMQ_LOG_BASE!"=="" (
if "!LOG_BASE!"=="" (
@@ -418,7 +417,7 @@ exit /b :filter_path
REM Ensure ERL_LIBS begins with valid path
-IF [%ERL_LIBS%] EQU [] (
+IF "%ERL_LIBS%"=="" (
set ERL_LIBS=%~dps1%~n1%~x1
) else (
set ERL_LIBS=%ERL_LIBS%;%~dps1%~n1%~x1
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index a318b55d75..d307e79138 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -115,8 +115,8 @@ if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}" fi -if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then - cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}" +if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then + cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}" fi set -e diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index de25f95bdf..ea417dcad4 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -79,8 +79,8 @@ if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" ( mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
)
-if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
- copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
+if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
+ copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
)
set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 624d18d913..2f118205ab 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -165,8 +165,8 @@ if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" ( mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
)
-if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
- copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
+if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
+ copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
)
REM Try to create advanced config file, if it doesn't exist
REM It still can fail to be created, but at least not for default install
|