diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-09-24 14:48:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-09-24 14:48:59 +0000 |
| commit | e1d5b333307b0f44c64060e2362513ecc756073f (patch) | |
| tree | 45dd468f29a7f01c83983c9a1fb5be344f1b9252 /perl-install/standalone/drakfont | |
| parent | 212680799ea016077b4f600b6ab3b9dc0e694e59 (diff) | |
| download | drakx-e1d5b333307b0f44c64060e2362513ecc756073f.tar drakx-e1d5b333307b0f44c64060e2362513ecc756073f.tar.gz drakx-e1d5b333307b0f44c64060e2362513ecc756073f.tar.bz2 drakx-e1d5b333307b0f44c64060e2362513ecc756073f.tar.xz drakx-e1d5b333307b0f44c64060e2362513ecc756073f.zip | |
factorize /etc/X11/fontpath.d path
Diffstat (limited to 'perl-install/standalone/drakfont')
| -rwxr-xr-x | perl-install/standalone/drakfont | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 769f811d2..0b30faf29 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -150,6 +150,7 @@ foreach my $i (@application) { # PATH and binary full path #my $xfs_conffile = '/etc/fonts/fonts.conf'; my $font_dir = '/usr/share/fonts'; +my $fontpathd_dir = '/etc/X11/fontpath.d/'; my $drakfont_dir = "$font_dir/drakfont"; my $ttf2pt1 = '/usr/sbin/ttf2pt1'; my $pfm2afm = '/usr/sbin/pfm2afm'; @@ -165,7 +166,7 @@ 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_('/etc/X11/fontpath.d/*')), grep { /\d+:\s/ } `$chkfontpath -l`)) { + foreach (uniq((map { expand_symlinks($_) } glob_("$fontpathd_dir/*")), grep { /\d+:\s/ } `$chkfontpath -l`)) { chomp; s/\d+:\s//gi; s/:\w*$//gi; |