diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-09 12:11:54 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-09 12:11:54 +0100 |
| commit | aaa1c65236c48b856a6c900b74621777a785c18b (patch) | |
| tree | 465b9da3dc2dc1bebf2bb5ba407b1d5be0efad90 /scripts | |
| parent | ab2f7d3b940f8ab13287faa5057d6047a58abcf4 (diff) | |
| download | rabbitmq-server-git-aaa1c65236c48b856a6c900b74621777a785c18b.tar.gz | |
pass PLUGINS_DIR and PLUGINS_DIST_DIR to rabbitmq-plugin
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-plugin | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugin.bat | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/scripts/rabbitmq-plugin b/scripts/rabbitmq-plugin index a1f0883707..4583873072 100755 --- a/scripts/rabbitmq-plugin +++ b/scripts/rabbitmq-plugin @@ -17,10 +17,16 @@ . `dirname $0`/rabbitmq-env +[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="${RABBITMQ_HOME}/plugins" + +[ "x" = "x$RABBITMQ_PLUGINS_DIST_DIR" ] && RABBITMQ_PLUGINS_DIST_DIR="${RABBITMQ_HOME}/provided_plugins" + exec erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ -sname rabbitmq-plugin$$ \ -s rabbit_plugin \ + -plugins_dir "$RABBITMQ_PLUGINS_DIR" \ + -plugins_dist_dir "$RABBITMQ_PLUGINS_DIST_DIR" \ -extra "$@" diff --git a/scripts/rabbitmq-plugin.bat b/scripts/rabbitmq-plugin.bat index e557501f68..0aaad0ef3c 100755 --- a/scripts/rabbitmq-plugin.bat +++ b/scripts/rabbitmq-plugin.bat @@ -26,7 +26,7 @@ setlocal enabledelayedexpansion if not exist "!ERLANG_HOME!\bin\erl.exe" (
echo.
echo ******************************
- echo ERLANG_HOME not set correctly.
+ echo ERLANG_HOME not set correctly.
echo ******************************
echo.
echo Please either set ERLANG_HOME to point to your Erlang installation or place the
@@ -35,7 +35,10 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( exit /B
)
-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugin!RANDOM! -s rabbit_plugin -extra !STAR!
+set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
+set RABBITMQ_PLUGINS_DIST_DIR=!TDP0!..\provided_plugins
+
+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugin!RANDOM! -s rabbit_plugin -plugins_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIST_DIR:\=/!" -extra !STAR!
endlocal
endlocal
|