From 30847ec66103bdbaa8b7787577677c24d583500f Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Sat, 30 May 2015 02:48:59 +0000
Subject: Fix config loading in shell

Config files from the command line would expect the wrong format:

    {app1, [...]}.
    {app2, [...]}.

Instead of the correct sys.config format:

    [{app1, [...]},
     {app2, [...]}]

Not supported yet: the recursive file references documented in
http://www.erlang.org/doc/man/config.html
---
 src/rebar_prv_shell.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index 74e2386..5110f52 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -237,4 +237,7 @@ find_config_relx(State) ->
 consult_config(State, Filename) ->
     Fullpath = filename:join(rebar_dir:root_dir(State), Filename),
     ?DEBUG("Loading configuration from ~p", [Fullpath]),
-    rebar_file_utils:try_consult(Fullpath).
+    case rebar_file_utils:try_consult(Fullpath) of
+        [T] -> T;
+        [] -> []
+    end.
-- 
cgit v1.1