summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-10-15 12:27:36 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2011-10-15 12:27:36 +0100
commita0fd784d7dbfbee544b91aef7fc4027cdd7a9701 (patch)
tree782bcebdd77f57a89808dfef6bf02ebf2554e955 /scripts
parent370a19c95af58bbb61d727fa7a9868adf698697c (diff)
parent2c51116a998daa1c1a6314de0e942168eb1b70d9 (diff)
downloadrabbitmq-server-git-a0fd784d7dbfbee544b91aef7fc4027cdd7a9701.tar.gz
merge default into bug24308
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 11cc7215bb..1831f87699 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -65,8 +65,14 @@ fi
RABBITMQ_START_RABBIT=
[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
-mkdir -p $(dirname ${RABBITMQ_PID_FILE})
-echo $$ > ${RABBITMQ_PID_FILE}
+case "$(uname -s)" in
+ CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait
+ # will not be able to make sense of it anyway
+ ;;
+ *) mkdir -p $(dirname ${RABBITMQ_PID_FILE});
+ echo $$ > ${RABBITMQ_PID_FILE}
+ ;;
+esac
RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then