summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-20 15:49:04 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-20 15:49:04 +0000
commit6c9fd55a321183b45ee26ef13e9592084a55d6fe (patch)
tree2ded9533e116357666b384320006af9925c1f03e /perl-install
parent9bff16755070ddafdf3062563d76139bbdd594b3 (diff)
downloaddrakx-6c9fd55a321183b45ee26ef13e9592084a55d6fe.tar
drakx-6c9fd55a321183b45ee26ef13e9592084a55d6fe.tar.gz
drakx-6c9fd55a321183b45ee26ef13e9592084a55d6fe.tar.bz2
drakx-6c9fd55a321183b45ee26ef13e9592084a55d6fe.tar.xz
drakx-6c9fd55a321183b45ee26ef13e9592084a55d6fe.zip
(list_fontpath) chkfontpath is no more mandatory
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/drakfont3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index fae4e5400..f537b37d8 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -166,7 +166,8 @@ my @installed_fonts_path; # list of path included in xfs
my @installed_fonts_full_path; # full path list of fonts to uninstall
sub list_fontpath() {
- foreach (uniq((map { expand_symlinks($_) } glob_("$fontpathd_dir/*")), grep { /\d+:\s/ } `$chkfontpath -l`)) {
+ foreach (uniq((map { expand_symlinks($_) } glob_("$fontpathd_dir/*")),
+ (-x $chkfontpath ? grep { /\d+:\s/ } `$chkfontpath -l`) : ()) {
chomp;
s/\d+:\s//gi;
s/:\w*$//gi;