diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-03-01 16:32:44 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-03-01 16:32:44 +0000 |
| commit | 36ea3f82b342986eb3186b8b4b04b7507a9c4dd0 (patch) | |
| tree | d6cf248602b8bfad1468d02d4b2ecad5d521502d | |
| parent | a6ce4b07a68849ea7f69a3e26b952ba3e6df08fc (diff) | |
| download | drakx-backup-do-not-use-36ea3f82b342986eb3186b8b4b04b7507a9c4dd0.tar drakx-backup-do-not-use-36ea3f82b342986eb3186b8b4b04b7507a9c4dd0.tar.gz drakx-backup-do-not-use-36ea3f82b342986eb3186b8b4b04b7507a9c4dd0.tar.bz2 drakx-backup-do-not-use-36ea3f82b342986eb3186b8b4b04b7507a9c4dd0.tar.xz drakx-backup-do-not-use-36ea3f82b342986eb3186b8b4b04b7507a9c4dd0.zip | |
Reduced the paths to search for Star/Open Office, on systems without these applications installed the search needed a significant time.
| -rw-r--r-- | perl-install/printer.pm | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 445e7aea8..1e6299100 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -2057,14 +2057,11 @@ sub removeopenofficeprinterentry { } sub findsofficeconfigfile { - my @configfilenames = ("/usr/lib/*/share/xp3/Xpdefaults", - "/usr/local/lib/*/share/xp3/Xpdefaults", - "/usr/local/*/share/xp3/Xpdefaults", - "/opt/*/share/xp3/Xpdefaults", - "/*/share/xp3/Xpdefaults", - "/*/*/share/xp3/Xpdefaults", - "/*/*/*/share/xp3/Xpdefaults", - "/*/*/*/*/share/xp3/Xpdefaults"); + my @configfilenames = + ("/usr/lib/*/share/xp3/Xpdefaults", + "/usr/local/lib/*/share/xp3/Xpdefaults", + "/usr/local/*/share/xp3/Xpdefaults", + "/opt/*/share/xp3/Xpdefaults"); my $configfilename = ""; for $configfilename (@configfilenames) { local *F; @@ -2082,11 +2079,7 @@ sub findopenofficeconfigfile { ("/usr/lib/*/share/psprint/psprint.conf", "/usr/local/lib/*/share/psprint/psprint.conf", "/usr/local/*/share/psprint/psprint.conf", - "/opt/*/share/psprint/psprint.conf", - "/*/share/psprint/psprint.conf", - "/*/*/share/psprint/psprint.conf", - "/*/*/*/share/psprint/psprint.conf", - "/*/*/*/*/share/psprint/psprint.conf"); + "/opt/*/share/psprint/psprint.conf"); my $configfilename = ""; for $configfilename (@configfilenames) { local *F; |