summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2019-01-01 16:19:27 -0600
committerMart Raudsepp <leio@gentoo.org>2019-02-11 19:14:01 +0200
commitb604ed0cb3599f50ef0a6354ca28dc7649b511ba (patch)
tree5ca163697103a219b8dacdc3d172092c225db5d2
parentxdg-utils: use path based lookup instead of hardcoded paths (diff)
downloadgentoo-b604ed0cb3599f50ef0a6354ca28dc7649b511ba.tar.gz
gentoo-b604ed0cb3599f50ef0a6354ca28dc7649b511ba.tar.bz2
gentoo-b604ed0cb3599f50ef0a6354ca28dc7649b511ba.zip
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 <hanetzer@startmail.com> Signed-off-by: Mart Raudsepp <leio@gentoo.org>
-rw-r--r--eclass/xdg.eclass8
1 files 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