Skip to content

Rename schema file to match application name. #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2017
Merged

Rename schema file to match application name. #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 priv/schema/rabbitmq.schema → priv/schema/rabbit.schema
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/rabbitmq-server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/rabbitmq-server.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
4 changes: 2 additions & 2 deletions scripts/rabbitmq-service.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down