Always copy rabbit.schema file

lukebakken · michaelklishin · commit 22f20759359e · 2019-01-24T12:55:43.000+03:00
Fixes #1843 (cherry picked from commit 07abb47)
diff --git 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
@@ -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
@@ -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!" ^

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,7 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (`
`130`	`130`	`mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"`
`131`	`131`	`)`
`132`	`132`
`133`		`- if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (`
`134`		`- copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"`
`135`		`- )`
	`133`	`+ copy /Y "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"`
`136`	`134`
`137`	`135`	`set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^`
`138`	`136`	`-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^`
Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,7 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (`
`213`	`213`	`mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"`
`214`	`214`	`)`
`215`	`215`
`216`		`- if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (`
`217`		`- copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"`
`218`		`- )`
	`216`	`+ copy /Y "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"`
`219`	`217`
`220`	`218`	`set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^`
`221`	`219`	`-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^`