diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2019-08-28 09:29:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 09:29:50 -0700 |
| commit | e4eb57b518f64de24e8d5ab1c557ebf12f722c6f (patch) | |
| tree | 9f11fe893cb389ffdcf160d9ead4e0b9d5186eee | |
| parent | 397fd4f5df2658563ff5e210403142932093ffc5 (diff) | |
| parent | 5a56c19aaef7c3746ba34a94c8d4423f8f0a4144 (diff) | |
| download | rabbitmq-server-git-e4eb57b518f64de24e8d5ab1c557ebf12f722c6f.tar.gz | |
Merge pull request #2087 from rabbitmq/lrb-ensure-env-var-set-win32
On Win32, ensure RABBITMQ_FEATURE_FLAGS_FILE_source is set to "environment" correctly
| -rw-r--r-- | scripts/rabbitmq-env.bat | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 08ff4a726a..342230d00b 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -288,6 +288,7 @@ if "!RABBITMQ_FEATURE_FLAGS_FILE!"=="" ( )
) else (
set RABBITMQ_FEATURE_FLAGS_FILE=!RABBITMQ_FEATURE_FLAGS_FILE:"=!
+ set RABBITMQ_FEATURE_FLAGS_FILE_source=environment
)
REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR}
@@ -403,21 +404,21 @@ if defined RABBITMQ_DEV_ENV ( REM We may need to query the running node for the plugins directory
REM and the "enabled plugins" file.
if not "%RABBITMQ_FEATURE_FLAGS_FILE_source%" == "environment" (
- for /f "delims=" %%F in ('!SCRIPT_DIR!\rabbitmqctl eval "{ok, P} = application:get_env(rabbit, feature_flags_file), io:format(""~s~n"", [P])."') do @set feature_flags_file=%%F
+ for /f "delims=" %%F in ('!SCRIPT_DIR!\rabbitmqctl.bat eval "{ok, P} = application:get_env(rabbit, feature_flags_file), io:format(""~s~n"", [P])."') do @set feature_flags_file=%%F
if exist "!feature_flags_file!" (
set RABBITMQ_FEATURE_FLAGS_FILE=!feature_flags_file:"=!
)
REM set feature_flags_file=
)
if not "%RABBITMQ_PLUGINS_DIR_source%" == "environment" (
- for /f "delims=" %%F in ('!SCRIPT_DIR!\rabbitmqctl eval "{ok, P} = application:get_env(rabbit, plugins_dir), io:format(""~s~n"", [P])."') do @set plugins_dir=%%F
+ for /f "delims=" %%F in ('!SCRIPT_DIR!\rabbitmqctl.bat eval "{ok, P} = application:get_env(rabbit, plugins_dir), io:format(""~s~n"", [P])."') do @set plugins_dir=%%F
if exist "!plugins_dir!" (
set RABBITMQ_PLUGINS_DIR=!plugins_dir:"=!
)
REM set plugins_dir=
)
if not "%RABBITMQ_ENABLED_PLUGINS_FILE_source%" == "environment" (
- for /f "delims=" %%F in ('!SCRIPT_DIR!\rabbitmqctl eval "{ok, P} = application:get_env(rabbit, enabled_plugins_file), io:format(""~s~n"", [P])."') do @set enabled_plugins_file=%%F
+ for /f "delims=" %%F in ('!SCRIPT_DIR!\rabbitmqctl.bat eval "{ok, P} = application:get_env(rabbit, enabled_plugins_file), io:format(""~s~n"", [P])."') do @set enabled_plugins_file=%%F
if exist "!enabled_plugins_file!" (
set RABBITMQ_ENABLED_PLUGINS_FILE=!enabled_plugins_file:"=!
)
|