diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-22 17:36:03 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-22 17:36:03 +0100 |
| commit | 8705e92302e760cdd160b995f2028d20b65035e2 (patch) | |
| tree | 72bed3fe9f99560c4fbec0c5ab218d924710bf4c /scripts | |
| parent | c0796e125724dbae63f0faff0f2ee4cd66791e52 (diff) | |
| parent | 42cd6a4e553e44dd09d2d8004cf7ea3eac7da25c (diff) | |
| download | rabbitmq-server-git-8705e92302e760cdd160b995f2028d20b65035e2.tar.gz | |
merge default into bug20284
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 1 |
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 "$@" - |