diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2016-12-13 08:39:04 +0100 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2016-12-13 08:39:04 +0100 |
| commit | 321abd47ccc97d3de3b0bcae388ea30299fd47a6 (patch) | |
| tree | 0b5adf0ba727fb17152fc5affe3500c7068bdf5c /scripts | |
| parent | f43990d05f8c629e41e9f748d7e8f6963039905f (diff) | |
| parent | 21e8b335950b6871c71e5e3de54ea249fe4322f9 (diff) | |
| download | rabbitmq-server-git-321abd47ccc97d3de3b0bcae388ea30299fd47a6.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index b85b4348c1..33369616ef 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -106,7 +106,7 @@ else fi if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then - mkdir "${RABBITMQ_SCHEMA_DIR}" + mkdir -p "${RABBITMQ_SCHEMA_DIR}" fi if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index c9e404db46..347a5e62ae 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -269,6 +269,10 @@ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"! -comment "Multi-protocol open source messaging broker" ^
-args "!ERLANG_SERVICE_ARGUMENTS!" > NUL
+if ERRORLEVEL 1 (
+ EXIT /B 1
+)
+
goto END
|