diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-09-30 17:54:28 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-10-02 22:08:04 -0400 |
| commit | ca37e0d89ad5c83cef039c28735f68ccc9e7bd61 (patch) | |
| tree | 66e136873f18901423380490ac5af1426a30a505 /eclass/xdg-utils.eclass | |
| parent | dev-libs/re2: bump to 2018.10.01 (diff) | |
| download | gentoo-ca37e0d89ad5c83cef039c28735f68ccc9e7bd61.tar.gz gentoo-ca37e0d89ad5c83cef039c28735f68ccc9e7bd61.tar.bz2 gentoo-ca37e0d89ad5c83cef039c28735f68ccc9e7bd61.zip | |
xdg-utils.eclass: avoid duplicate leading slashes
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass/xdg-utils.eclass')
| -rw-r--r-- | eclass/xdg-utils.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass index 2c2d2324c2b7..725b67316221 100644 --- a/eclass/xdg-utils.eclass +++ b/eclass/xdg-utils.eclass @@ -67,7 +67,7 @@ xdg_environment_reset() { # Updates the .desktop files database. # Generates a list of mimetypes linked to applications that can handle them xdg_desktop_database_update() { - local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}" + local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}" if [[ ${EBUILD_PHASE} != post* ]] ; then die "xdg_desktop_database_update must be used in pkg_post* phases." @@ -79,7 +79,7 @@ xdg_desktop_database_update() { fi ebegin "Updating .desktop files database" - "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}" + "${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}" eend $? } @@ -88,7 +88,7 @@ xdg_desktop_database_update() { # Update the mime database. # Creates a general list of mime types from several sources xdg_mimeinfo_database_update() { - local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}" + local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}" if [[ ${EBUILD_PHASE} != post* ]] ; then die "xdg_mimeinfo_database_update must be used in pkg_post* phases." @@ -100,6 +100,6 @@ xdg_mimeinfo_database_update() { fi ebegin "Updating shared mime info database" - "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}" + "${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}" eend $? } |