Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: font.eclass
Date: Sun, 16 Sep 2007 20:08:32
Message-Id: E1IX0Ib-0005UV-0z@stork.gentoo.org
1 dirtyepic 07/09/16 20:00:57
2
3 Modified: font.eclass
4 Log:
5 Handle ${ROOT} and whitespace, suggested by vapier.
6
7 Revision Changes Path
8 1.32 eclass/font.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/font.eclass?rev=1.32&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/font.eclass?rev=1.32&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/font.eclass?r1=1.31&r2=1.32
13
14 Index: font.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/font.eclass,v
17 retrieving revision 1.31
18 retrieving revision 1.32
19 diff -u -r1.31 -r1.32
20 --- font.eclass 16 Sep 2007 07:07:52 -0000 1.31
21 +++ font.eclass 16 Sep 2007 20:00:56 -0000 1.32
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2007 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.31 2007/09/16 07:07:52 dirtyepic Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.32 2007/09/16 20:00:56 dirtyepic Exp $
27
28 # Author: foser <foser@g.o>
29
30 @@ -109,14 +109,8 @@
31
32 font_pkg_postinst() {
33 # unreadable font files = fontconfig segfaults
34 - badperms="$( find /usr/share/fonts/ -type f \! -perm 0644 -print )"
35 - if [[ -n ${badperms} ]]; then
36 - echo
37 - for fontfile in ${badperms}; do
38 - ewarn $( chmod -v 0644 ${fontfile} )
39 - done
40 - echo
41 - fi
42 + find "${ROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \
43 + | xargs -r -0 chmod -v 0644
44
45 if has_version '>=media-libs/fontconfig-2.4'; then
46 if [ ${ROOT} == "/" ]; then
47 @@ -129,14 +123,8 @@
48
49 font_pkg_postrm() {
50 # unreadable font files = fontconfig segfaults
51 - badperms="$( find /usr/share/fonts/ -type f \! -perm 0644 -print )"
52 - if [[ -n ${badperms} ]]; then
53 - echo
54 - for fontfile in ${badperms}; do
55 - ewarn $( chmod -v 0644 ${fontfile} )
56 - done
57 - echo
58 - fi
59 + find "${ROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \
60 + | xargs -r -0 chmod -v 0644
61
62 if has_version '>=media-libs/fontconfig-2.4'; then
63 if [ ${ROOT} == "/" ]; then
64
65
66
67 --
68 gentoo-commits@g.o mailing list