diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-30 12:33:26 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-30 12:33:26 +0100 |
| commit | 72dcf7c5b48a3b60af81dfa0071b9de4e7c6b0a7 (patch) | |
| tree | 6066662d5bd21e5b92a889801fdecb2a431612e4 | |
| parent | 561333bd0e1ddf71ab18295d5027d51c873a1100 (diff) | |
| download | rabbitmq-server-git-72dcf7c5b48a3b60af81dfa0071b9de4e7c6b0a7.tar.gz | |
rabbitmq-env: Ensure RABBITMQ_HOME is an absolute path
This helps rabbitmq-plugins when it queries rabbitmqctl to get the
various plugins path variables.
| -rw-r--r-- | scripts/rabbitmq-env | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 0cfd540273..0014643260 100644 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -45,7 +45,19 @@ if [ -z "$RABBITMQ_SCRIPTS_DIR" ]; then RABBITMQ_SCRIPTS_DIR=`dirname $SCRIPT_PATH` fi -RABBITMQ_HOME="${RABBITMQ_SCRIPTS_DIR}/.." +rmq_realpath() { + local path=$1 + + if [ -d "$path" ]; then + cd "$path" && pwd + elif [ -f "$path" ]; then + cd "$(dirname "$path")" && echo $(pwd)/$(basename "$path") + else + echo "$path" + fi +} + +RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")" ## Set defaults . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults @@ -119,18 +131,6 @@ rmq_normalize_path_var() { done } -rmq_realpath() { - local path=$1 - - if [ -d "$path" ]; then - cd "$path" && pwd - elif [ -f "$path" ]; then - cd "$(dirname "$path")" && echo $(pwd)/$(basename "$path") - else - echo "$path" - fi -} - rmq_check_if_shared_with_mnesia() { local var warning |