From 0516b405ccb98febcf94a8e94000f4a633569f59 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 15 Jun 2014 19:18:14 -0500
Subject: provider task dependencies

---
 src/rlx_prv_overlay.erl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/rlx_prv_overlay.erl')

diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl
index 23df218..4cbbf31 100644
--- a/src/rlx_prv_overlay.erl
+++ b/src/rlx_prv_overlay.erl
@@ -22,7 +22,7 @@
 %%% into a release directory.
 -module(rlx_prv_overlay).
 
--behaviour(rlx_provider).
+-behaviour(provider).
 
 -export([init/1,
          do/1,
@@ -34,12 +34,24 @@
 
 -include("relx.hrl").
 
+-define(PROVIDER, overlay).
+-define(DEPS, [resolve_release]).
+
 %%============================================================================
 %% API
 %%============================================================================
+
 -spec init(rlx_state:t()) -> {ok, rlx_state:t()}.
 init(State) ->
-    {ok, State}.
+    State1 = rlx_state:add_provider(State, providers:create([{name, ?PROVIDER},
+                                                             {module, ?MODULE},
+                                                             {bare, false},
+                                                             {deps, ?DEPS},
+                                                             {example, "overlay"},
+                                                             {short_desc, ""},
+                                                             {desc, ""},
+                                                             {opts, []}])),
+    {ok, State1}.
 
 %% @doc recursively dig down into the library directories specified in the state
 %% looking for OTP Applications
-- 
cgit v1.2.3


From e4849bd132b28ba1e1420686aadf8b2136c44fbd Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 1 Oct 2014 08:03:25 -0500
Subject: support config passed in as proplist instead of filename

---
 src/rlx_prv_overlay.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/rlx_prv_overlay.erl')

diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl
index 4cbbf31..f7e2be8 100644
--- a/src/rlx_prv_overlay.erl
+++ b/src/rlx_prv_overlay.erl
@@ -377,7 +377,12 @@ get_relative_root(State) ->
         [] ->
             rlx_state:root_dir(State);
         Config ->
-            filename:dirname(Config)
+            case filelib:is_regular(Config) of
+                true ->
+                    filename:dirname(Config);
+                false ->
+                    rlx_state:root_dir(State)
+            end
     end.
 
 -spec is_directory(file:name(), file:name()) -> boolean().
-- 
cgit v1.2.3