Add escript folder to store build ctl escripts

5 files changed, 16 insertions, 12 deletions

diff --git a/scripts/rabbitmq-diagnostics b/scripts/rabbitmq-diagnostics
index 22adfb12ca..40e9ec0177 100755
--- a/scripts/rabbitmq-diagnostics
+++ b/scripts/rabbitmq-diagnostics
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-`dirname $0`/run-escript `dirname $0`/escript/rabbitmq-diagnostics
\ No newline at end of file
+set -a
+
+. `dirname $0`/rabbitmq-env
+
+escript $ESCRIPT_DIR/rabbitmq-diagnostics "$@"
\ No newline at end of file
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 206bdd0c20..8349f10fbf 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -58,6 +58,7 @@ rmq_realpath() {
 }
 
 RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")"
+ESCRIPT_DIR="${RABBITMQ_HOME}/escript"
 
 ## Set defaults
 . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index a7058295fe..c9b6408ea0 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-`dirname $0`/run-escript `dirname $0`/escript/rabbitmq-plugins
\ No newline at end of file
+set -a
+
+. `dirname $0`/rabbitmq-env
+
+escript $ESCRIPT_DIR/rabbitmq-plugins --formatter=plugins -q "$@"
\ No newline at end of file
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index b3f9661e1e..048062b00d 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-`dirname $0`/run-escript `dirname $0`/escript/rabbitmqctl $@
\ No newline at end of file
+set -a
+
+. `dirname $0`/rabbitmq-env
+
+escript $ESCRIPT_DIR/rabbitmqctl "$@"
diff --git a/scripts/run-escript b/scripts/run-escript
deleted file mode 100755
index e481afc7f6..0000000000
--- a/scripts/run-escript
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -a
-
-. `dirname $0`/rabbitmq-env
-
-escript $@
-
-