diff options
| author | Sebastien Dupont <sdupont@mandriva.com> | 2001-10-11 12:01:31 +0000 |
|---|---|---|
| committer | Sebastien Dupont <sdupont@mandriva.com> | 2001-10-11 12:01:31 +0000 |
| commit | 138981d40b61491203bd394947bb73c39eb1c31e (patch) | |
| tree | 0e2b8aa27e361a7c5e8e00555fb1642153c19a4b | |
| parent | 449866781232d26acceda469852fad26fc5e8da6 (diff) | |
| download | drakx-138981d40b61491203bd394947bb73c39eb1c31e.tar drakx-138981d40b61491203bd394947bb73c39eb1c31e.tar.gz drakx-138981d40b61491203bd394947bb73c39eb1c31e.tar.bz2 drakx-138981d40b61491203bd394947bb73c39eb1c31e.tar.xz drakx-138981d40b61491203bd394947bb73c39eb1c31e.zip | |
correction of option install --replace
| -rwxr-xr-x | perl-install/standalone/drakfont | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 967b17711..393febe1f 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -96,7 +96,6 @@ foreach (@ARGV) { print "app : @application\n"; print "install : @install\n"; print "uninstall : @uninstall\n"; -#print "xx $xlsfonts\n"; my $xfs_conffile = '/etc/X11/fs/config'; my $drakfont_dir = '/home/seb/new_drackfont'; @@ -168,6 +167,8 @@ sub search_windows_font { 1; } + + sub search_dir_font { my @font_list_tmp = (); my @font_list_tmpp = (); @@ -185,8 +186,11 @@ sub search_dir_font { !grep /$i/, (@installed_fonts) and push @font_list, "$fn$i"; } } - else { push @font_list, @font_list_tmp; - } + else { + foreach my $i (@font_list_tmp) { + grep /$i/, @font_list or push @font_list, $fn."/".$i; + } + } } } } @@ -272,7 +276,6 @@ sub interactive_mode { } -# install & uninstall a revoir -# au niveau du passage de paramettre -# un grep comme avant (qui ne sert pas a rien) + +# faire la gestion des applications + printer # faire une valeure de retour pour toutes les fonctions |