summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-07 14:07:39 +0200
committerJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-10-20 11:10:48 +0200
commit1fff560708e83a24d4400e4f7a16a65cdb8fc39f (patch)
tree4a39a371a7c11630259f81c736a0be4e409594cf
parentdba8ec338ab58c7f882a356a79ec3f7e92766812 (diff)
downloadrabbitmq-server-git-1fff560708e83a24d4400e4f7a16a65cdb8fc39f.tar.gz
Add plugins dir to ERL_LIBS even for non-dev environment
-rwxr-xr-xscripts/rabbitmq-env10
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index e66ef98956..156c05dbc5 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -270,8 +270,16 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then
# in this case, take DEPS_DIR directly.
ERL_LIBS="${DEPS_DIR_norm}:${ERL_LIBS}"
fi
+else
+ if [ -d "${RABBITMQ_PLUGINS_DIR}" ]; then
+ # RabbitMQ was started from its install directory. Take
+ # rabbit_common from the plugins directory.
+ ERL_LIBS="${RABBITMQ_PLUGINS_DIR}:${ERL_LIBS}"
+ fi
+fi
- ERL_LIBS=${ERL_LIBS%:}
+ERL_LIBS=${ERL_LIBS%:}
+if [ "$ERL_LIBS" ]; then
export ERL_LIBS
fi