1 |
commit: 1ed8e949399ec73afb736b6ce2b15b93d16b012a |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 4 19:10:37 2022 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 12 19:14:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed8e949 |
7 |
|
8 |
rebar.eclass: simplify EPREFIX usage |
9 |
|
10 |
EPREFIX is never slash terminated, in all EAPIs. |
11 |
|
12 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
13 |
|
14 |
eclass/rebar.eclass | 8 ++++---- |
15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/eclass/rebar.eclass b/eclass/rebar.eclass |
18 |
index 5ee99aed445c..c982dea5d1fd 100644 |
19 |
--- a/eclass/rebar.eclass |
20 |
+++ b/eclass/rebar.eclass |
21 |
@@ -68,7 +68,7 @@ _rebar_find_dep() { |
22 |
local p |
23 |
local result |
24 |
|
25 |
- pushd "${EPREFIX%/}/$(get_erl_libs)" >/dev/null || return 1 |
26 |
+ pushd "${EPREFIX}/$(get_erl_libs)" >/dev/null || return 1 |
27 |
for p in ${pn} ${pn}-*; do |
28 |
if [[ -d ${p} ]]; then |
29 |
# Ensure there's at most one matching. |
30 |
@@ -107,7 +107,7 @@ erebar() { |
31 |
|
32 |
(( $# > 0 )) || die "erebar: at least one target is required" |
33 |
|
34 |
- local -x ERL_LIBS="${EPREFIX%/}/$(get_erl_libs)" |
35 |
+ local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)" |
36 |
[[ ${1} == eunit ]] && local -x ERL_LIBS="." |
37 |
|
38 |
rebar -v skip_deps=true "$@" || die -n "rebar $@ failed" |
39 |
@@ -128,7 +128,7 @@ rebar_fix_include_path() { |
40 |
|
41 |
local pn="${1}" |
42 |
local rebar_config="${2:-rebar.config}" |
43 |
- local erl_libs="${EPREFIX%/}/$(get_erl_libs)" |
44 |
+ local erl_libs="${EPREFIX}/$(get_erl_libs)" |
45 |
local p |
46 |
|
47 |
p="$(_rebar_find_dep "${pn}")" \ |
48 |
@@ -217,7 +217,7 @@ rebar_src_prepare() { |
49 |
rebar_src_configure() { |
50 |
debug-print-function ${FUNCNAME} "${@}" |
51 |
|
52 |
- local -x ERL_LIBS="${EPREFIX%/}/$(get_erl_libs)" |
53 |
+ local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)" |
54 |
default |
55 |
} |