diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-07-29 22:13:49 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-07-29 22:13:49 +0300 |
| commit | 5fd24fbb744b975c943e512595423cddbd61442c (patch) | |
| tree | e27c086a987890be0b49ca746b75c11179b3ab35 | |
| parent | c9c2876b3dff656ddabedc0b2ab8d9ed11853297 (diff) | |
| parent | 429768cb795694d492550a29b62e5a76198cad72 (diff) | |
| download | rabbitmq-server-git-5fd24fbb744b975c943e512595423cddbd61442c.tar.gz | |
Merge pull request #240 from Jakauppila/rabbitmq-server-239
Modify the default path of RABBITMQ_CONF_ENV_FILE within rabbitmq-defaults.bat
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat index d3983f22cf..d1e3b4141b 100644 --- a/scripts/rabbitmq-defaults.bat +++ b/scripts/rabbitmq-defaults.bat @@ -33,5 +33,5 @@ set PLUGINS_DIR=!TDP0!..\plugins REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf if "!RABBITMQ_CONF_ENV_FILE!"=="" ( - set CONF_ENV_FILE=!APPDATA!\RabbitMQ\rabbitmq-env-conf.bat + set RABBITMQ_CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat ) diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 8657f1e609..604260a0e4 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -35,7 +35,7 @@ REM set SERVER_ERL_ARGS=+P 1048576 REM ## Get configuration variables from the configure environment file REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true if exist "!RABBITMQ_CONF_ENV_FILE!" ( - call !RABBITMQ_CONF_ENV_FILE! + call "!RABBITMQ_CONF_ENV_FILE!" ) REM Check for the short names here too |