summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rabbitmq-server.bat9
-rw-r--r--scripts/rabbitmq-service.bat11
2 files changed, 11 insertions, 9 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 3fc99becf7..26145d5394 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -45,10 +45,11 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
) else (
if exist "!RABBITMQ_CONFIG_FILE!.conf" (
- del "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- "!ERLANG_HOME!\bin\escipt.exe" cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -s schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
- ren "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.*.config" "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"
+ "!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
+ ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"
+ set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
)
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 147f9f4d84..2e0b78fc03 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -116,11 +116,12 @@ set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
) else (
- if exist "!RABBITMQ_CONFIG_FILE!.conf" (
- del "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- "!ERLANG_HOME!\bin\escipt.exe" cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -s schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
- ren "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.*.config" "!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!/generated/rabbitmq.config"
+if exist "!RABBITMQ_CONFIG_FILE!.conf" (
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
+ del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"
+ "!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
+ ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"
+ set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
)
)