diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-02-04 12:42:27 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-02-04 12:42:27 +0000 |
| commit | 6e025090032c42f033314f12595eda51d8d0db05 (patch) | |
| tree | 9619c4de3e3275f06ee4857b855fe408b4d3b454 /packaging | |
| parent | c11482bfaf6886571eed19efedb41588475d2cbf (diff) | |
| parent | 9a167fe6b2d12bd453f4f80d70b1e57ab594e754 (diff) | |
| download | rabbitmq-server-git-6e025090032c42f033314f12595eda51d8d0db05.tar.gz | |
stable to default
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 6 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index 1949dacae8..c9508847f9 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -30,14 +30,14 @@ cd /var/lib/rabbitmq SCRIPT=`basename $0` if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then - /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ + exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then if [ -f $PWD/.erlang.cookie ] ; then export HOME=. fi - /usr/lib/rabbitmq/bin/${SCRIPT} "$@" + exec /usr/lib/rabbitmq/bin/${SCRIPT} "$@" elif [ `id -u` = 0 ] ; then - @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" + exec @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" else /usr/lib/rabbitmq/bin/${SCRIPT} echo diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index 53fc31fcfd..5dc802a8c2 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -7,9 +7,9 @@ dist: tar -zxf ../../dist/$(SOURCE_DIR).tar.gz $(MAKE) -C $(SOURCE_DIR) - mkdir $(SOURCE_DIR)/sbin + mkdir -p $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/*.bat $(SOURCE_DIR)/sbin - mkdir $(SOURCE_DIR)/etc + mkdir -p $(SOURCE_DIR)/etc cp $(SOURCE_DIR)/docs/rabbitmq.config.example $(SOURCE_DIR)/etc/rabbitmq.config.example cp README-etc $(SOURCE_DIR)/etc/README.txt rm -rf $(SOURCE_DIR)/scripts |