summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-10-01 10:01:07 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-10-01 10:01:07 +0100
commita31f800b002405c654fe043816cd69057fb9a2ee (patch)
treeac97255f5650d84be0a2767250f01db5c1409911 /scripts
parentd93894fed66dbba7822e55051be21e82814b0b38 (diff)
parent5b038b35fbe3695d5020174a16b5bb901c6a294e (diff)
downloadrabbitmq-server-git-a31f800b002405c654fe043816cd69057fb9a2ee.tar.gz
merge default into bug22902
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server2
-rwxr-xr-xscripts/rabbitmqctl1
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 9310752f6f..8e26663a50 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -82,7 +82,7 @@ fi
[ -f "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
RABBITMQ_START_RABBIT=
-[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
+[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 92e5312bb2..76ce25fdfe 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -47,4 +47,3 @@ exec erl \
-s rabbit_control \
-nodename $RABBITMQ_NODENAME \
-extra "$@"
-