diff options
| author | Tim Watson <tim.watson@gmail.com> | 2012-06-14 15:23:31 +0100 |
|---|---|---|
| committer | Tim Watson <tim.watson@gmail.com> | 2012-06-14 15:23:31 +0100 |
| commit | 138bb19ae3292e32b7286226c49462cae82f7b68 (patch) | |
| tree | 2c74656b0f5d38c8acdcd9afa6093fd20bbcdf5f /scripts | |
| parent | 517923a521343d24ca36cb32da1b09d1665076e9 (diff) | |
| parent | 676679813d14134f8dad9e9a7a12847ad950aeac (diff) | |
| download | rabbitmq-server-git-138bb19ae3292e32b7286226c49462cae82f7b68.tar.gz | |
merge default
Diffstat (limited to 'scripts')
| -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 bc198393ec..3c26872671 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 09d4661f98..b8822739f5 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" ^
|