diff options
| author | Daniil Fedotov <hairyhum@gmail.com> | 2017-06-16 15:42:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 15:42:55 +0100 |
| commit | 2014558366e10e07860659ed639f0a4cb7bcad81 (patch) | |
| tree | 185d442d16509d8b37884fad747d96288c43f8c6 /scripts | |
| parent | 1de9c89d34c65145cad487ef3daeaf6aff84930d (diff) | |
| parent | 63c2637d49b43a5662113d303efb7df4a5298350 (diff) | |
| download | rabbitmq-server-git-2014558366e10e07860659ed639f0a4cb7bcad81.tar.gz | |
Merge pull request #1267 from rabbitmq/rename-schema-file
Rename schema file to match application name.
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, 6 insertions, 6 deletions
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
|