From ddee7ec046f6460e60459b0d09060db6dfc86923 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 23 Nov 2014 13:32:50 -0600
Subject: [PATCH] fix plugin module template, add merl to escript, upgrade
 erlydtl

---
 priv/templates/plugin.erl.dtl | 3 +--
 rebar.config                  | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/priv/templates/plugin.erl.dtl b/priv/templates/plugin.erl.dtl
index af85d7fc..e525ab32 100644
--- a/priv/templates/plugin.erl.dtl
+++ b/priv/templates/plugin.erl.dtl
@@ -19,7 +19,7 @@ init(State) ->
             {bare, true},               % The task can be run by the user, always true
             {deps, ?DEPS},              % The list of dependencies
             {example, "rebar {{name}}"}, % How to use the plugin
-            {opts, []}                  % list of options understood by the plugin
+            {opts, []},                  % list of options understood by the plugin
             {short_desc, "{{desc}}"},
             {desc, ""}
     ]),
@@ -33,4 +33,3 @@ do(State) ->
 -spec format_error(any()) ->  iolist().
 format_error(Reason, State) ->
     io_lib:format("~p", [Reason]).
-
diff --git a/rebar.config b/rebar.config
index abbb3fbe..7bc15cad 100644
--- a/rebar.config
+++ b/rebar.config
@@ -6,7 +6,7 @@
 {escript_incl_extra, [{"priv/templates/*", "."}, {"rebar/include/*", "."}]}.
 
 {escript_incl_apps,
- [getopt, erlydtl, erlware_commons, relx,  providers, rebar]}.
+ [getopt, merl, erlydtl, erlware_commons, relx,  providers, rebar]}.
 {escript_top_level_app, rebar}.
 {escript_name, rebar3}.
 
@@ -33,6 +33,9 @@
        {providers, "",
         {git, "https://github.com/tsloughter/providers.git",
          {branch, "format_error1"}}},
+       {erlydtl, ".*",
+         {git, "https://github.com/erlydtl/erlydtl.git",
+          {tag, "0.9.4"}}},
        {relx, "",
         {git, "https://github.com/tsloughter/relx.git",
          {branch, "format_error1"}}},