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 | |
| parent | 4c90882d2792dbec967ffddae164ce5e46d5b762 (diff) | |
| download | rabbitmq-server-git-9c57bdf81f336be9ed79f61e92efc982490d52e3.tar.gz | |
Rename rabbitmq-sys to rabbitmq-locations
| -rw-r--r-- | packaging/generic-unix/Makefile | 4 | ||||
| -rw-r--r-- | packaging/generic-unix/rabbitmq-locations (renamed from packaging/generic-unix/rabbitmq-sys) | 0 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 10 | ||||
| -rw-r--r-- | scripts/rabbitmq-locations (renamed from scripts/rabbitmq-sys) | 0 |
5 files changed, 6 insertions, 12 deletions
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index 9014c3add8..5989d5c0fd 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -12,8 +12,8 @@ dist: MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ install - cp -f rabbitmq-sys $(TARGET_DIR)/sbin - chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-sys + cp -f rabbitmq-locations $(TARGET_DIR)/sbin + chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-locations mkdir -p $(TARGET_DIR)/etc/rabbitmq diff --git a/packaging/generic-unix/rabbitmq-sys b/packaging/generic-unix/rabbitmq-locations index 8812f8d22b..8812f8d22b 100644 --- a/packaging/generic-unix/rabbitmq-sys +++ b/packaging/generic-unix/rabbitmq-locations diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index 4124b141ca..cae0ebf319 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -91,9 +91,9 @@ post-destroot { xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir} reinplace -E "s:^SYS_PREFIX=\${RABBITMQ_HOME}$:SYS_PREFIX=${prefix}:" \ - ${realsbin}/rabbitmq-sys + ${realsbin}/rabbitmq-locations reinplace -E "s:^SYS_PREFIX=$:SYS_PREFIX=${prefix}:" \ - ${realsbin}/rabbitmq-sys + ${realsbin}/rabbitmq-locations xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \ ${wrappersbin}/rabbitmq-server 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 |