xdg-utils.eclass: avoid duplicate leading slashes
authorMike Gilbert <floppym@gentoo.org>
Sun, 30 Sep 2018 21:54:28 +0000 (17:54 -0400)
committerMike Gilbert <floppym@gentoo.org>
Wed, 3 Oct 2018 02:08:04 +0000 (22:08 -0400)
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
eclass/xdg-utils.eclass

index 2c2d2324c2b7d576c57c75f965eda8572220eda1..725b673162214c9ed253ac951f21399b18433000 100644 (file)
@@ -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 $?
 }