diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-11-08 19:08:23 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-11-08 19:08:23 +0100 |
| commit | db3515ba7855dae6fdce4e6fc622fc9e1bdda75a (patch) | |
| tree | 0adb97891cbdd02b180fdebf1da33ee25bdb4946 /scripts/rabbitmq-env | |
| parent | fa8784fe7c343992cc3591b0d0353e560d252067 (diff) | |
| parent | 81e2170a6c6f4d4835e7731a9d251f5eadd060ce (diff) | |
| download | rabbitmq-server-git-db3515ba7855dae6fdce4e6fc622fc9e1bdda75a.tar.gz | |
Merge branch 'rabbitmq-cli-integration'
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 206bdd0c20..f1962e2b7b 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 @@ -244,9 +245,8 @@ rmq_check_if_shared_with_mnesia \ ## Development-specific environment. if [ "${RABBITMQ_DEV_ENV}" ]; then - if [ "$(basename "$0")" = 'rabbitmq-plugins' -a \( \ - "$RABBITMQ_PLUGINS_DIR_source" != 'environment' -o \ - "$RABBITMQ_ENABLED_PLUGINS_FILE_source" != 'environment' \) ]; then + if [ "$RABBITMQ_PLUGINS_DIR_source" != 'environment' -o \ + "$RABBITMQ_ENABLED_PLUGINS_FILE_source" != 'environment' ]; then # We need to query the running node for the plugins directory # and the "enabled plugins" file. eval $( (${RABBITMQ_SCRIPTS_DIR}/rabbitmqctl eval \ |