From b604ed0cb3599f50ef0a6354ca28dc7649b511ba Mon Sep 17 00:00:00 2001 From: "Marty E. Plummer" Date: Tue, 1 Jan 2019 16:19:27 -0600 Subject: [PATCH] xdg.eclass: use ED and don't export variables Package-Manager: Portage-2.3.51, Repoman 2.3.11 Signed-off-by: Marty E. Plummer Signed-off-by: Mart Raudsepp --- eclass/xdg.eclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass index 5ed4739f86a2..967a9fd023fa 100644 --- a/eclass/xdg.eclass +++ b/eclass/xdg.eclass @@ -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 -- 2.26.2