| 1 |
commit: 4171aea709df12cdd338d1ccac805b8a885f03f2 |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 27 12:39:45 2016 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 27 12:59:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4171aea7 |
| 7 |
|
| 8 |
net-im/ejabberd: Remove leading double / |
| 9 |
|
| 10 |
net-im/ejabberd/ejabberd-16.04.ebuild | 6 +++--- |
| 11 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild |
| 14 |
index eb64457..7fd509d 100644 |
| 15 |
--- a/net-im/ejabberd/ejabberd-16.04.ebuild |
| 16 |
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild |
| 17 |
@@ -114,7 +114,7 @@ ejabberd_cert_exists() { |
| 18 |
|
| 19 |
for cert in $(gawk -- \ |
| 20 |
'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \ |
| 21 |
- "${EROOT}${JABBER_ETC}/ejabberd.yml"); do |
| 22 |
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do |
| 23 |
[[ -f ${cert} ]] && return 0 |
| 24 |
done |
| 25 |
|
| 26 |
@@ -126,8 +126,8 @@ ejabberd_cert_exists() { |
| 27 |
ejabberd_cert_install() { |
| 28 |
SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" |
| 29 |
install_cert "${EJABBERD_CERT%.*}" |
| 30 |
- chown root:jabber "${EROOT}${EJABBERD_CERT}" || die |
| 31 |
- chmod 0440 "${EROOT}${EJABBERD_CERT}" || die |
| 32 |
+ chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die |
| 33 |
+ chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die |
| 34 |
} |
| 35 |
|
| 36 |
# Get path to ejabberd lib directory. |
Archives