diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-11-07 12:03:18 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-11-07 12:03:18 +0000 |
| commit | 02ffdc34f2191075d0b687522a53ba43d6eaaf65 (patch) | |
| tree | 8cf8dbaad2a831ac5a61b20c72b121756d390473 | |
| parent | f58e6d857dbef0f3d5f267d9276dfac54b737f3d (diff) | |
| download | rabbitmq-server-git-02ffdc34f2191075d0b687522a53ba43d6eaaf65.tar.gz | |
In development environment, check for ENABLED_PLUGINS_DIR for rabbitmqctl too
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -19,7 +19,10 @@ USAGES_ERL = $(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) EXTRA_SOURCES += $(USAGES_ERL) .DEFAULT_GOAL = all -$(PROJECT).d:: $(EXTRA_SOURCES) gen_escripts +$(PROJECT).d:: $(EXTRA_SOURCES) + +rel:: + $(MAKE) gen_escripts gen_escripts: cp -r ${DEPS_DIR}/rabbitmq_cli/escript ./ diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 8349f10fbf..f1962e2b7b 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -245,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 \ |