summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Dupont <sdupont@mandriva.com>2001-10-10 15:14:04 +0000
committerSebastien Dupont <sdupont@mandriva.com>2001-10-10 15:14:04 +0000
commit5fb2550227f1ec66440b850e42ac72373990d2b7 (patch)
treecf476c465fe6d8de1db84df4fb6d4f26f73f3bf1
parent3663ae5fcb8d9df672cb65ef4b2c1a8a36d67e8f (diff)
downloaddrakx-5fb2550227f1ec66440b850e42ac72373990d2b7.tar
drakx-5fb2550227f1ec66440b850e42ac72373990d2b7.tar.gz
drakx-5fb2550227f1ec66440b850e42ac72373990d2b7.tar.bz2
drakx-5fb2550227f1ec66440b850e42ac72373990d2b7.tar.xz
drakx-5fb2550227f1ec66440b850e42ac72373990d2b7.zip
update install dir
-rwxr-xr-xperl-install/standalone/drakfont4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 76d6392cd..90b135093 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -71,7 +71,7 @@ my $windows = "@ARGV" =~ /--windows_import|-wi/;
my $strong = "@ARGV" =~ /--strong|-s/;
my $replace = "@ARGV" =~ /--replace|-r/;
my ($application) = "@ARGV" =~ /--application (\w+)/;
-my ($install) = "@ARGV" =~ /--install (\w*)/;
+my ($install) = "@ARGV" =~ /--install (\w)/;
my ($uninstall) = "@ARGV" =~ /--uninstall (\w+)/;
my $xfs_conffile = '/etc/X11/fs/config';
@@ -158,7 +158,7 @@ sub search_dir_font {
foreach my $i (@installed_fonts) {
foreach my $j (@font_list_tmp) {
- if ( $j =~ /$i/) { push @font_list, "$i" ;}
+ if (( $j =~ !/$i/) && !grep ($j , @font_list)) { push @font_list, "$j" ;}
}
}