Move schema dir creation to the point it's going to be used.

On startup some environments do not expect schema dir if they
use the old config. The script might fail with an error, while
there is no reason to.

Author: hairyhum

scripts/rabbitmq-server

@@ -62,18 +62,6 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 
 [ "$NOTIFY_SOCKET" ] && RUNNING_UNDER_SYSTEMD=true
 
-if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
-    mkdir -p "${RABBITMQ_SCHEMA_DIR}"
-fi
-
-if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; 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
-
 get_noex() {
     if [ "x" = "x${1}" ]; then
         echo ""
@@ -164,6 +152,18 @@ fi
 
 # Set -conf and other generated config parameters
 if [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
+        mkdir -p "${RABBITMQ_SCHEMA_DIR}"
+    fi
+
+    if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; 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
+
     RABBITMQ_GENERATED_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
                                    -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
                                    -conf_script_dir `dirname $0` \

scripts/rabbitmq-server.bat

@@ -48,18 +48,6 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 
 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
 
-if not exist "!RABBITMQ_SCHEMA_DIR!" (
-    mkdir "!RABBITMQ_SCHEMA_DIR!"
-)
-
-if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
-    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"
-)
-
 CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX
 
 if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" (
@@ -134,6 +122,18 @@ if exist !RABBITMQ_CONFIG_ARG_FILE! (
 
 rem Set -conf and other generated config parameters
 if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (
+    if not exist "!RABBITMQ_SCHEMA_DIR!" (
+        mkdir "!RABBITMQ_SCHEMA_DIR!"
+    )
+
+    if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
+        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"
+    )
+
     set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
                                       -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
                                       -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

scripts/rabbitmq-service.bat

@@ -131,18 +131,6 @@ if errorlevel 1 (
 
 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
 
-if not exist "!RABBITMQ_SCHEMA_DIR!" (
-    mkdir "!RABBITMQ_SCHEMA_DIR!"
-)
-
-if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
-    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"
-)
-
 CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX
 
 if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" (
@@ -217,6 +205,18 @@ if exist !RABBITMQ_CONFIG_ARG_FILE! (
 
 rem Set -conf and other generated config parameters
 if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (
+    if not exist "!RABBITMQ_SCHEMA_DIR!" (
+        mkdir "!RABBITMQ_SCHEMA_DIR!"
+    )
+
+    if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
+        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"
+    )
+
     set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
                                       -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
                                       -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^