diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-06-01 11:01:25 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-06-01 11:01:25 +0100 |
| commit | f1a2fdc74e62e517ec155b5c993162da80b4db04 (patch) | |
| tree | b54ecc3da1c3ec6539c08c561ba56f470238c766 | |
| parent | 790df01e7d4e4edaa17e90e314025bdf850121e7 (diff) | |
| download | rabbitmq-server-f1a2fdc74e62e517ec155b5c993162da80b4db04.tar.gz | |
Backport 06796ad6250b (Merge of bug24924; RABBITMQ_PLUGINS_DIR not settable on Windows)
| -rwxr-xr-x | scripts/rabbitmq-plugins.bat | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index 66a900a1..3d7a2d99 100755 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -43,7 +43,9 @@ if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" ( set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins
)
-set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
+if "!RABBITMQ_PLUGINS_DIR!"=="" (
+ set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
+)
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM! -s rabbit_plugins -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR!
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index ca49a5d8..0123ed24 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -86,7 +86,10 @@ if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" ( set RABBITMQ_ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins
)
-set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
+if "!RABBITMQ_PLUGINS_DIR!"=="" (
+ set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
+)
+
set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
"!ERLANG_HOME!\bin\erl.exe" ^
|