diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-02-09 17:50:10 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-02-09 17:50:10 +0000 |
| commit | 47e9a22eec09404bf820ae0513635bea352a20ca (patch) | |
| tree | d3887b8af22007b62bc4e459c7fdfc41aea985a3 | |
| parent | dd1225bb279d07d57bde0415b26666f59497658c (diff) | |
| download | rabbitmq-server-bug22336.tar.gz | |
Don't set env vars to the empty stringbug22336
| -rwxr-xr-x | scripts/rabbitmq-multi | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index a6eb102a..627daad7 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -40,8 +40,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq DEFAULT_NODE_IP_ADDRESS=0.0.0.0 DEFAULT_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} +[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] then if [ "x" != "x$RABBITMQ_NODE_PORT" ] diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index e75cab69..9a50d158 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -44,8 +44,8 @@ SERVER_START_ARGS= DEFAULT_NODE_IP_ADDRESS=0.0.0.0 DEFAULT_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} +[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] then if [ "x" != "x$RABBITMQ_NODE_PORT" ] |