diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-06-09 16:28:45 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-06-09 16:28:45 +0100 |
| commit | a1b510bad714e565bb12b95b5952b1793b94dc46 (patch) | |
| tree | 8126e4b57648568a4404dd4429b5b20d51662d67 /scripts | |
| parent | ef2118aa90bccfaf7e29bbfe1b23f39f23f6f6f7 (diff) | |
| parent | 65e089254f4a6fead5b6adfe425ec59690ae893d (diff) | |
| download | rabbitmq-server-git-a1b510bad714e565bb12b95b5952b1793b94dc46.tar.gz | |
Merge in default
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugins | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 1ab819f6ce..1d9afbd8a5 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## 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 diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 861e0b32f5..b77416703d 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## 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 @@ -52,4 +52,4 @@ if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ fi ## Get configuration variables from the configure environment file -[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} +[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 2213e20bf1..36910effac 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## 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 diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 03cd80e11a..18d24542e3 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## 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 diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index ff9cb7fa50..309abf2a0d 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## 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 |