diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-29 15:15:46 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-29 15:15:46 +0000 |
| commit | 49e7b8ac36d652df8959c3344cad4364aa76fc8d (patch) | |
| tree | 6811c7eea870f85c2834c6e296c4ab5d71d73a40 | |
| parent | 9a02d208d7efb3c96c7fd90cd8d5f02572e311dc (diff) | |
| download | rabbitmq-server-49e7b8ac36d652df8959c3344cad4364aa76fc8d.tar.gz | |
Remove check -- hmm, that means the generic-unix rabbitmq-defaults can be created by the build step
| -rw-r--r-- | packaging/generic-unix/Makefile | 5 | ||||
| -rw-r--r-- | packaging/generic-unix/rabbitmq-defaults | 38 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults | 2 |
3 files changed, 4 insertions, 41 deletions
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index d485bf6b..f6fed64e 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -12,8 +12,9 @@ dist: MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ install - cp -f rabbitmq-defaults $(TARGET_DIR)/sbin - chmod 0755 $(TARGET_DIR)/sbin/rabbitmq-defaults + sed -e 's:^SYS_PREFIX=$:SYS_PREFIX=\${RABBITMQ_HOME}:' \ + $(TARGET_DIR)/sbin/rabbitmq-defaults >$(TARGET_DIR)/sbin/rabbitmq-defaults.tmp \ + && mv $(TARGET_DIR)/sbin/rabbitmq-defaults.tmp $(TARGET_DIR)/sbin/rabbitmq-defaults mkdir -p $(TARGET_DIR)/etc/rabbitmq diff --git a/packaging/generic-unix/rabbitmq-defaults b/packaging/generic-unix/rabbitmq-defaults deleted file mode 100644 index 76d10447..00000000 --- a/packaging/generic-unix/rabbitmq-defaults +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -## The contents of this file are subject to the Mozilla Public License -## Version 1.1 (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License -## at http://www.mozilla.org/MPL/ -## -## Software distributed under the License is distributed on an "AS IS" -## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -## the License for the specific language governing rights and -## limitations under the License. -## -## The Original Code is RabbitMQ. -## -## The Initial Developer of the Original Code is VMware, Inc. -## Copyright (c) 2012 VMware, Inc. All rights reserved. -## - -### generic-unix ### -### next line potentially updated in package install steps -SYS_PREFIX=${RABBITMQ_HOME} - -check_and_set_rabbitmq_file_location() { - # $1 - var name (set), $2 - global location, $3 - optional suffix for check - [ -f $2$3 ] && [ ! -f ${SYS_PREFIX}$2$3 ] && \ - echo "WARNING: $1 default is \"${SYS_PREFIX}$2\" although \"$2$3\" exists." - eval "$1=${SYS_PREFIX}$2" -} - -## Set default values - -check_and_set_rabbitmq_file_location CONF_ENV_FILE /etc/rabbitmq/rabbitmq-env.conf -check_and_set_rabbitmq_file_location CONFIG_FILE /etc/rabbitmq/rabbitmq .config -check_and_set_rabbitmq_file_location ENABLED_PLUGINS_FILE /etc/rabbitmq/enabled-plugins -check_and_set_rabbitmq_file_location LOG_BASE /var/log/rabbitmq -check_and_set_rabbitmq_file_location MNESIA_BASE /var/lib/rabbitmq/mnesia - -PLUGINS_DIR="${RABBITMQ_HOME}/plugins" - diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 3930e262..4763f086 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -15,7 +15,7 @@ ## Copyright (c) 2012 VMware, Inc. All rights reserved. ## -### next line potentially updated in package install steps, do not alter +### next line potentially updated in package install steps SYS_PREFIX= ## Set default values |