diff options
| author | Daniil Fedotov <hairyhum@gmail.com> | 2018-08-13 13:47:07 +0100 |
|---|---|---|
| committer | Daniil Fedotov <hairyhum@gmail.com> | 2018-08-14 14:19:42 +0100 |
| commit | bcdd78881966ea2b06503e36d27438f5db2a2293 (patch) | |
| tree | e84be3529c0580ed00e922ee7002237b6fe456ce | |
| parent | f1db86a816dd439aad39cbfd95b80ec7e17dc773 (diff) | |
| download | rabbitmq-server-git-bcdd78881966ea2b06503e36d27438f5db2a2293.tar.gz | |
Move file with no extension variable assignment before it's used
| -rw-r--r-- | scripts/rabbitmq-server.bat | 3 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 9c13f5f87e..65e23f497a 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -112,6 +112,8 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE" ( )
)
+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
+
if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (
if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"
@@ -127,7 +129,6 @@ if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" rem Set -config if the file exists
if exist !RABBITMQ_CONFIG_ARG_FILE! (
- CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 5f47b155a2..1b82b53e8c 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -195,6 +195,8 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE" ( )
)
+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
+
if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (
if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"
@@ -210,7 +212,6 @@ if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" rem Set -config if the file exists
if exist !RABBITMQ_CONFIG_ARG_FILE! (
- CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"
)
|