Merge branch 'master' into rabbitmq-server-567

1 files changed, 4 insertions, 35 deletions

diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index d72df8ad86..c9b6408ea0 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -1,38 +1,7 @@
-#!/bin/sh -e
-##  The contents of this file are subject to the Mozilla Public License
-##  Version 1.1 (the "License"); you may not use this file except in
-##  compliance with the License. You may obtain a copy of the License
-##  at http://www.mozilla.org/MPL/
-##
-##  Software distributed under the License is distributed on an "AS IS"
-##  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-##  the License for the specific language governing rights and
-##  limitations under the License.
-##
-##  The Original Code is RabbitMQ.
-##
-##  The Initial Developer of the Original Code is GoPivotal, Inc.
-##  Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
-##
+#!/usr/bin/env bash
 
-# Get default settings with user overrides for (RABBITMQ_)<var_name>
-# Non-empty defaults should be set in rabbitmq-env
-. `dirname $0`/rabbitmq-env
+set -a
 
-# Disable erl_crash.dump by default for control scripts.
-if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; then
-    export ERL_CRASH_DUMP_SECONDS=0
-fi
+. `dirname $0`/rabbitmq-env
 
-RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
-exec ${ERL_DIR}erl \
-    -pa "${RABBITMQ_HOME}/ebin" \
-    -noinput \
-    -hidden \
-    ${RABBITMQ_CTL_ERL_ARGS} \
-    -boot "${CLEAN_BOOT_FILE}" \
-    -s rabbit_plugins_main \
-    -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
-    -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \
-    -nodename $RABBITMQ_NODENAME \
-    -extra "$@"
+escript $ESCRIPT_DIR/rabbitmq-plugins --formatter=plugins -q "$@"
\ No newline at end of file