summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Wragg <david@rabbitmq.com>2010-11-23 10:58:49 +0000
committerDavid Wragg <david@rabbitmq.com>2010-11-23 10:58:49 +0000
commitd5276790137419632cfcdc1c43250166ab125732 (patch)
treefecba36b8505a6a35c06cedf227fd748c51eeb38 /scripts
parent89fcddb7e956f077169947c2abe8a13ea7337fc0 (diff)
parente64d8aa70ef29db76b40ecffe9d24902e0444e12 (diff)
downloadrabbitmq-server-git-d5276790137419632cfcdc1c43250166ab125732.tar.gz
Merge bug23186 into default
plugin activator should use command line args instead of rabbit env vars
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rabbitmq-server.bat2
-rw-r--r--scripts/rabbitmq-service.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 9d1e92136d..94180de95a 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -121,7 +121,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
-extra "!RABBITMQ_PLUGINS_DIR:\=/!" ^
"!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"
-set RABBITMQ_BOOT_FILE=!RABBITMQ_MNESIA_DIR!\plugins-scratch\rabbit
+set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit
if not exist "!RABBITMQ_BOOT_FILE!.boot" (
echo Custom Boot File "!RABBITMQ_BOOT_FILE!.boot" is missing.
exit /B 1
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 21f5267b35..2c96b6fd15 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -190,7 +190,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
-extra "!RABBITMQ_PLUGINS_DIR:\=/!" ^
"!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"
-set RABBITMQ_BOOT_FILE=!RABBITMQ_MNESIA_DIR!\plugins-scratch\rabbit
+set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit
if not exist "!RABBITMQ_BOOT_FILE!.boot" (
echo Custom Boot File "!RABBITMQ_BOOT_FILE!.boot" is missing.
exit /B 1