diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2019-01-25 17:41:12 +0100 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2019-01-25 17:41:12 +0100 |
| commit | dcf663fcf99eeefb1c0de07e7389b47988cfbd92 (patch) | |
| tree | eff2f2f31d572615bc2453378f3b760d1323bb9f /scripts | |
| parent | 9eaa79d5f80ec3025ce0dbbac5e81a60437dec7c (diff) | |
| parent | a4b602567081b28c4bc53ac5995b5c054a305da9 (diff) | |
| download | rabbitmq-server-git-dcf663fcf99eeefb1c0de07e7389b47988cfbd92.tar.gz | |
Merge branch 'master' into rabbitmq-server-1838-active-field-for-consumers
Conflicts:
src/rabbit_fifo.erl
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index b205785b33..efff38c3af 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -160,9 +160,7 @@ if [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}" fi - if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then - cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}" - fi + cp -f "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}" RABBITMQ_GENERATED_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \ -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 41677775f7..9039243c62 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -130,9 +130,7 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" ( mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
)
- if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
- copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
- )
+ copy /Y "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 57a9587ced..08cc29f2c8 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -213,9 +213,7 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" ( mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
)
- if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
- copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
- )
+ copy /Y "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
|