From f1ed8ed36c9b8761829657c6b51cfb0cdaa68dad Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 7 Jan 2015 12:01:05 -0600
Subject: do not include dir . in relx lib paths it will break lib discovery
---
src/rebar_prv_release.erl | 3 ++-
src/rebar_prv_tar.erl | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index d7495a5..29e1dc2 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -34,7 +34,8 @@ init(State) ->
do(State) ->
Options = rebar_state:command_args(State),
DepsDir = rebar_dir:deps_dir(State),
- LibDirs = lists:usort(rebar_utils:filtermap(fun ec_file:exists/1, [DepsDir | ?DEFAULT_PROJECT_APP_DIRS])),
+ LibDirs = rebar_utils:filtermap(fun ec_file:exists/1,
+ [DepsDir | lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS)]),
OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR),
AllOptions = string:join(["release" | Options], " "),
try
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index 2a69a28..7efa544 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -34,7 +34,8 @@ init(State) ->
do(State) ->
Options = rebar_state:command_args(State),
DepsDir = rebar_dir:deps_dir(State),
- LibDirs = lists:usort(rebar_utils:filtermap(fun ec_file:exists/1, [DepsDir | ?DEFAULT_PROJECT_APP_DIRS])),
+ LibDirs = rebar_utils:filtermap(fun ec_file:exists/1,
+ [DepsDir | lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS)]),
OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR),
AllOptions = string:join(["release", "tar" | Options], " "),
case rebar_state:get(State, relx, []) of
--
cgit v1.1