summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-10-13 16:51:53 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-10-13 16:51:53 +0100
commit9a7f390919fbb64e4d27170582d23b39dad2952d (patch)
tree80f1cab0f305b605c7f0d8f4fb327171c5222f5c
parente680875be3709a7b90f6f278e8308097e59ed268 (diff)
parentff3354a89d295d1f7cacdb6449768edce5b340aa (diff)
downloadrabbitmq-server-9a7f390919fbb64e4d27170582d23b39dad2952d.tar.gz
Merge bug24478
-rwxr-xr-xscripts/rabbitmq-server10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 11cc7215..1831f876 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