diff options
| author | Paul Jones <paulj@lshift.net> | 2009-07-29 12:50:02 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-07-29 12:50:02 +0100 |
| commit | 890a21ca83314dab87249b04e48f54db56b71249 (patch) | |
| tree | d42d2a44a318e3d516a56a5bd4d75c637a6ef01e /scripts/rabbitmq-multi | |
| parent | 5367d72b3ca4595a97e0ace82616df4ceaa8591e (diff) | |
| download | rabbitmq-server-git-890a21ca83314dab87249b04e48f54db56b71249.tar.gz | |
Renamed activate-plugins to rabbitmq-activate-plugins; changed scripts to use rabbitmq-env to source paths instead of embedding the logic themselves
Diffstat (limited to 'scripts/rabbitmq-multi')
| -rwxr-xr-x | scripts/rabbitmq-multi | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 129a202d7f..7db4cb70b2 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -37,19 +37,7 @@ PIDS_FILE=/var/lib/rabbitmq/pids MULTI_ERL_ARGS= MULTI_START_ARGS= -SCRIPT_PATH="$0" -while [ -h "$SCRIPT_PATH" ] ; do - ls=`ls -ld "$SCRIPT_PATH"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - SCRIPT_PATH="$link" - else - SCRIPT_PATH="`dirname "$SCRIPT_PATH"`/$link" - fi -done -SCRIPT_DIR=`dirname $SCRIPT_PATH` - -[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf +. `dirname $0`/rabbitmq-env [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} @@ -72,7 +60,7 @@ export \ set -f exec erl \ - -pa "${SCRIPT_DIR}/../ebin" \ + -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ ${RABBITMQ_MULTI_ERL_ARGS} \ |