Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 3/4] desktop.eclass: domenu, remove unnecessary nested loop
Date: Thu, 26 Jul 2018 11:36:58
Message-Id: 20180726113553.1387-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] desktop.eclass: domenu, fix dying on non-existing files by "Michał Górny"
1 ---
2 eclass/desktop.eclass | 8 +++-----
3 1 file changed, 3 insertions(+), 5 deletions(-)
4
5 diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
6 index 8f2c6d55c293..08899b4a4607 100644
7 --- a/eclass/desktop.eclass
8 +++ b/eclass/desktop.eclass
9 @@ -244,15 +244,13 @@ domenu() {
10 (
11 # wrap the env here so that the 'insinto' call
12 # doesn't corrupt the env of the caller
13 - local i j ret=0
14 + local i ret=0
15 insopts -m 0644
16 insinto /usr/share/applications
17 for i in "$@" ; do
18 if [[ -d ${i} ]] ; then
19 - for j in "${i}"/*.desktop ; do
20 - doins "${j}"
21 - ((ret|=$?))
22 - done
23 + doins "${i}"/*.desktop
24 + ((ret|=$?))
25 else
26 doins "${i}"
27 ((ret|=$?))
28 --
29 2.18.0