Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: freedesktop-bugs@g.o
Subject: [gentoo-dev] [PATCH 4/5] xdg.eclass: look for files in ED and cleanup array syntax
Date: Sun, 30 Sep 2018 22:51:59
Message-Id: 20180930225035.25434-4-floppym@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/5] xdg-utils.eclass: avoid duplicate leading slashes by Mike Gilbert
1 Signed-off-by: Mike Gilbert <floppym@g.o>
2 ---
3 eclass/xdg.eclass | 10 ++++------
4 1 file changed, 4 insertions(+), 6 deletions(-)
5
6 diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
7 index 36300dc5eaa2..4f4a38b05cb3 100644
8 --- a/eclass/xdg.eclass
9 +++ b/eclass/xdg.eclass
10 @@ -48,15 +48,13 @@ xdg_pkg_preinst() {
11
12 XDG_ECLASS_DESKTOPFILES=()
13 while IFS= read -r -d '' f; do
14 - XDG_ECLASS_DESKTOPFILES+=( ${f} )
15 - done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
16 + XDG_ECLASS_DESKTOPFILES+=( "${f}" )
17 + done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
18
19 XDG_ECLASS_MIMEINFOFILES=()
20 while IFS= read -r -d '' f; do
21 - XDG_ECLASS_MIMEINFOFILES+=( ${f} )
22 - done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
23 -
24 - export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_MIMEINFOFILES
25 + XDG_ECLASS_MIMEINFOFILES+=( "${f}" )
26 + done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
27 }
28
29 # @FUNCTION: xdg_pkg_postinst
30 --
31 2.19.0