commit 4b7e03a63bac7ce81033eab487a976ca049265a1
author Paul J. Davis <paul.joseph.davis@gmail.com> Tue Mar 12 15:23:07 2013 -0500
committer Paul J. Davis <paul.joseph.davis@gmail.com> Fri Jan 17 13:25:09 2014 -0800
tree 10dfb194cc2c96284c9a07f645c571336ba75bd8
parent e358fbbf2b287c3f4975e8b99c6f55c0dd33497e

Fix core etap tests

src/config_app.erl

diff --git a/src/config_app.erl b/src/config_app.erl
index 54f2433..5c5515a 100644
--- a/src/config_app.erl
+++ b/src/config_app.erl
@@ -28,14 +28,25 @@
     ok.
 
 get_ini_files() ->
+    hd([L || L <- [command_line(), env(), default()], L =/= skip]).
+
+env() ->
+    case application:get_env(config, ini_files) of
+        undefined ->
+            skip;
+        {ok, IniFiles} ->
+            IniFiles
+    end.
+
+command_line() ->
+    case init:get_argument(couch_ini) of
+        error ->
+            skip;
+        {ok, [IniFiles]} ->
+            IniFiles
+    end.
+
+default() ->
     Etc = filename:join(code:root_dir(), "etc"),
     Default = [filename:join(Etc,"default.ini"), filename:join(Etc,"local.ini")],
-    DefaultExists = lists:filter(fun filelib:is_file/1, Default),
-    case init:get_argument(couch_ini) of
-    error ->
-        DefaultExists;
-    {ok, [[]]} ->
-        DefaultExists;
-    {ok, [Values]} ->
-        Values
-    end.
+    lists:filter(fun filelib:is_file/1, Default).