diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-11-19 16:34:58 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-11-19 16:34:58 +0000 |
| commit | 17e620ac28b3dbbe0329a8b18d9a2b4f0f502260 (patch) | |
| tree | 84138e16e0027c8a0452c14a50bf5f4ee7dbeb87 /scripts/rabbitmqctl | |
| parent | db1b49406cded8fc0e616fb5b9090dd68025776b (diff) | |
| download | rabbitmq-server-git-17e620ac28b3dbbe0329a8b18d9a2b4f0f502260.tar.gz | |
Remove OS-conditional and use hostname more conservatively
Diffstat (limited to 'scripts/rabbitmqctl')
| -rwxr-xr-x | scripts/rabbitmqctl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index e024129d60..8e9e6965b1 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -30,14 +30,8 @@ ## Contributor(s): ______________________________________. ## -if [ "SunOS" = `uname -s` ] -then - [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` - NODENAME=rabbit@`echo $HOSTNAME | sed 's/\\..*//'` -else - [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` - NODENAME=rabbit@${HOSTNAME%%.*} -fi +[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` +NODENAME=rabbit@${HOSTNAME%%.*} . `dirname $0`/rabbitmq-env |