From a184554804de3905c01e3bbb49c0308ed3b51b14 Mon Sep 17 00:00:00 2001
From: Paul Jones <paulj@lshift.net>
Date: Wed, 22 Jul 2009 16:17:32 +0100
Subject: [PATCH] Updates to rabbitmq-server script to eliminate warnings about
 hidden files; ignoring generated directories

---
 .hgignore               | 1 +
 scripts/rabbitmq-server | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.hgignore b/.hgignore
index 7925f07a49..3323e2fc59 100644
--- a/.hgignore
+++ b/.hgignore
@@ -14,6 +14,7 @@ syntax: regexp
 ^ebin/rabbit.boot$
 ^ebin/rabbit.script$
 ^plugins/
+^priv/plugins/
 
 ^packaging/RPMS/Fedora/(BUILD|RPMS|SOURCES|SPECS|SRPMS)$
 ^packaging/debs/Debian/rabbitmq-server_.*\.(dsc|(diff|tar)\.gz|deb|changes)$
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 40d664113e..569f54d93f 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -77,8 +77,10 @@ RABBITMQ_START_RABBIT=
 
 if [ -f "`dirname $0`/../ebin/rabbit.boot" ]; then
 	RABBITMQ_BOOT_FILE="`dirname $0`/../ebin/rabbit"
+	RABBITMQ_EBIN_PATH=""
 else
 	RABBITMQ_BOOT_FILE=start_sasl
+	RABBITMQ_EBIN_PATH="-pa `dirname $0`/../ebin"
 fi
 
 # we need to turn off path expansion because some of the vars, notably
@@ -87,10 +89,10 @@ fi
 set -f
 
 exec erl \
-    -pa "`dirname $0`/../ebin" \
+	${RABBITMQ_EBIN_PATH} \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
-    -boot $RABBITMQ_BOOT_FILE \
+    -boot ${RABBITMQ_BOOT_FILE} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
     -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \