diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-09-13 21:21:23 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-09-13 21:21:23 +0000 |
| commit | 5048eb000b43e5d0692e5fbc3112600ff3011bfa (patch) | |
| tree | d905595de1628ec24c70c69af8f42f4ea59db1f1 /perl-install/printerdrake.pm | |
| parent | 964066f83f8bc531d5af0e546dca71af41c87003 (diff) | |
| download | drakx-5048eb000b43e5d0692e5fbc3112600ff3011bfa.tar drakx-5048eb000b43e5d0692e5fbc3112600ff3011bfa.tar.gz drakx-5048eb000b43e5d0692e5fbc3112600ff3011bfa.tar.bz2 drakx-5048eb000b43e5d0692e5fbc3112600ff3011bfa.tar.xz drakx-5048eb000b43e5d0692e5fbc3112600ff3011bfa.zip | |
Do not insist on "curl" to download PPDs from a CUPS server (for Star Office/OpenOffice.org/GIMP), take the one from "curl" and "wget" which is there. Install "webfetch" when none is there.
Let "cups-drivers" be installed when switching from normal to expert mode.
Diffstat (limited to 'perl-install/printerdrake.pm')
| -rw-r--r-- | perl-install/printerdrake.pm | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 95ebb51c7..61bec7737 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -2747,15 +2747,16 @@ sub install_spooler { my $w = $in->wait_message(_("Printerdrake"), _("Checking installed software...")); if ((!$::testing) && - (!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi - /sbin/ifconfig - /usr/bin/xpp - /usr/bin/curl), - ($::expert ? - "/usr/share/cups/model/postscript.ppd.gz" : ()) - )))) { + ((!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi + /sbin/ifconfig + /usr/bin/xpp), + ($::expert ? + "/usr/share/cups/model/postscript.ppd.gz" : ()) + ))) || + ((!printer::files_exist((qw(/usr/bin/wget)))) && + (!printer::files_exist((qw(/usr/bin/curl))))))) { $in->do_pkgs->install(('cups', 'net-tools', 'xpp', - 'curl', + 'webfetch', ($::expert ? 'cups-drivers' : ()))); } # Try to start the network when CUPS is the spooler, so that @@ -3206,6 +3207,11 @@ sub main { # Toggle expert mode and standard mode if ($menuchoice eq "\@usermode") { printer::set_usermode(!$::expert); + # make sure that the "cups-drivers" package gets + # installed when switching into expert mode + if (($::expert) && ($printer->{SPOOLER} eq "cups")) { + install_spooler($printer, $in, $upNetwork); + } # Read printer database for the new user mode %printer::thedb = (); #my $w = $in->wait_message(_("Printerdrake"), |