diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2016-11-22 16:53:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 16:53:45 -0500 |
| commit | 2c31f94858d66464cc5acfd4dbe74777f2f83453 (patch) | |
| tree | edc7757c2ff6dbd950de3f1d1f6ff77ca890c261 /src/rebar3.erl | |
| parent | 5f6d1d88acc2d8e228b569f6cc8d99da7fedbdf9 (diff) | |
| parent | 5323fdc377d6034cdb625547600144881ae1af46 (diff) | |
Merge pull request #1387 from ericmj/emj-rebar-config-env
Always read REBAR_CONFIG env var when loading config
Diffstat (limited to 'src/rebar3.erl')
| -rw-r--r-- | src/rebar3.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl index 47dc25a..4e7e284 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -149,12 +149,7 @@ init_config() -> Verbosity = log_level(), ok = rebar_log:init(command_line, Verbosity), - Config = case os:getenv("REBAR_CONFIG") of - false -> - rebar_config:consult_file(?DEFAULT_CONFIG_FILE); - ConfigFile -> - rebar_config:consult_file(ConfigFile) - end, + Config = rebar_config:consult(), Config1 = rebar_config:merge_locks(Config, rebar_config:consult_lock_file(?LOCK_FILE)), %% If $HOME/.config/rebar3/rebar.config exists load and use as global config |