diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-06-01 13:36:55 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-06-01 13:36:55 +0100 |
| commit | e3539a60364c0156aafdd3d2f5cbd1098f23d892 (patch) | |
| tree | 8e7180c39dc03bbea283fc3c5385635f74212a8a | |
| parent | d500ab674797f49fcd48e12ea7978237f228b176 (diff) | |
| parent | d1efa1a68252d33fd445a0261aaeaa9bf1f297c4 (diff) | |
| download | rabbitmq-server-e3539a60364c0156aafdd3d2f5cbd1098f23d892.tar.gz | |
Merged bug24974 into default
| -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 bc198393..3c268726 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_main -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 09d4661f..b8822739 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" ^
|