diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-24 10:10:05 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-24 10:10:05 +0000 |
| commit | 9c57bdf81f336be9ed79f61e92efc982490d52e3 (patch) | |
| tree | b683fce9798477e22a692e250dc035424782ba52 /scripts | |
| parent | 4c90882d2792dbec967ffddae164ce5e46d5b762 (diff) | |
| download | rabbitmq-server-git-9c57bdf81f336be9ed79f61e92efc982490d52e3.tar.gz | |
Rename rabbitmq-sys to rabbitmq-locations
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 10 | ||||
| -rw-r--r-- | scripts/rabbitmq-locations (renamed from scripts/rabbitmq-sys) | 0 |
2 files changed, 2 insertions, 8 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 1e3a06082d..3eb6952431 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -36,14 +36,8 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` NODENAME=rabbit@${HOSTNAME%%.*} -## Set system defaults -if [ ! -f ${SCRIPT_DIR}/rabbitmq-sys ]; then - echo -n "WARNING: system defaults are not available -- " - echo "check the installation completed correctly." - exit 1 -fi - -. ${SCRIPT_DIR}/rabbitmq-sys +## Get system default locations +. ${SCRIPT_DIR}/rabbitmq-locations ## Get configuration variables from the configure environment file if [ -f ${OLD_CONF_ENV_FILE} ] && \ diff --git a/scripts/rabbitmq-sys b/scripts/rabbitmq-locations index 7b7dfa5905..7b7dfa5905 100644 --- a/scripts/rabbitmq-sys +++ b/scripts/rabbitmq-locations |