xdg.eclass: use ED and don't export variables
authorMarty E. Plummer <hanetzer@startmail.com>
Tue, 1 Jan 2019 22:19:27 +0000 (16:19 -0600)
committerMart Raudsepp <leio@gentoo.org>
Mon, 11 Feb 2019 17:14:01 +0000 (19:14 +0200)
Package-Manager: Portage-2.3.51, Repoman 2.3.11
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
eclass/xdg.eclass

index 5ed4739f86a27000a09e196d9be4b7d0da24497f..967a9fd023fa8cdd12f2c0e9ce69c13e8a65c196 100644 (file)
@@ -49,19 +49,17 @@ xdg_pkg_preinst() {
        XDG_ECLASS_DESKTOPFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_DESKTOPFILES+=( ${f} )
-       done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
+       done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
 
        XDG_ECLASS_ICONFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_ICONFILES+=( ${f} )
-       done < <(cd "${D}" && find 'usr/share/icons' -type f -print0 2>/dev/null)
+       done < <(cd "${ED}" && find 'usr/share/icons' -type f -print0 2>/dev/null)
 
        XDG_ECLASS_MIMEINFOFILES=()
        while IFS= read -r -d '' f; do
                XDG_ECLASS_MIMEINFOFILES+=( ${f} )
-       done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
-
-       export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_ICONFILES XDG_ECLASS_MIMEINFOFILES
+       done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
 }
 
 # @FUNCTION: xdg_pkg_postinst