1 |
commit: ca37e0d89ad5c83cef039c28735f68ccc9e7bd61 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 30 21:54:28 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 3 02:08:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca37e0d8 |
7 |
|
8 |
xdg-utils.eclass: avoid duplicate leading slashes |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
eclass/xdg-utils.eclass | 8 ++++---- |
13 |
1 file changed, 4 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass |
16 |
index 2c2d2324c2b..725b6731622 100644 |
17 |
--- a/eclass/xdg-utils.eclass |
18 |
+++ b/eclass/xdg-utils.eclass |
19 |
@@ -67,7 +67,7 @@ xdg_environment_reset() { |
20 |
# Updates the .desktop files database. |
21 |
# Generates a list of mimetypes linked to applications that can handle them |
22 |
xdg_desktop_database_update() { |
23 |
- local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}" |
24 |
+ local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}" |
25 |
|
26 |
if [[ ${EBUILD_PHASE} != post* ]] ; then |
27 |
die "xdg_desktop_database_update must be used in pkg_post* phases." |
28 |
@@ -79,7 +79,7 @@ xdg_desktop_database_update() { |
29 |
fi |
30 |
|
31 |
ebegin "Updating .desktop files database" |
32 |
- "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}" |
33 |
+ "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}" |
34 |
eend $? |
35 |
} |
36 |
|
37 |
@@ -88,7 +88,7 @@ xdg_desktop_database_update() { |
38 |
# Update the mime database. |
39 |
# Creates a general list of mime types from several sources |
40 |
xdg_mimeinfo_database_update() { |
41 |
- local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}" |
42 |
+ local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}" |
43 |
|
44 |
if [[ ${EBUILD_PHASE} != post* ]] ; then |
45 |
die "xdg_mimeinfo_database_update must be used in pkg_post* phases." |
46 |
@@ -100,6 +100,6 @@ xdg_mimeinfo_database_update() { |
47 |
fi |
48 |
|
49 |
ebegin "Updating shared mime info database" |
50 |
- "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}" |
51 |
+ "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}" |
52 |
eend $? |
53 |
} |