diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:45:20 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:45:20 +0300 |
| commit | 4837af6cd04ccb87b5e2399495eff468fa99c1a3 (patch) | |
| tree | 6ce7d0f7fb9dedd25a400d5a016f1ccb3b0d36ac /scripts/rabbitmq-env | |
| parent | 008c4eb7f0a9b14838439db934eb98dbe7801dbb (diff) | |
| parent | 5c6d8e523349bb7df418cfff52b99f173a7cc4c1 (diff) | |
| download | rabbitmq-server-git-4837af6cd04ccb87b5e2399495eff468fa99c1a3.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
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 \ |