summaryrefslogtreecommitdiffstats
path: root/perl-install/printerdrake.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-08 18:26:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-08 18:26:31 +0000
commit157fe13a76e798fa8af5f79c792c704a593f6c93 (patch)
tree7dded9e6761033f09709722965d15b14ce7825bd /perl-install/printerdrake.pm
parentb4fd82d0ced6a2118a51b060d2eff8c4f179b52b (diff)
downloaddrakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar.gz
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar.bz2
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar.xz
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.zip
add interactive_pkgs stuff
Diffstat (limited to 'perl-install/printerdrake.pm')
-rw-r--r--perl-install/printerdrake.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 49a392312..71b2159fb 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -131,7 +131,7 @@ complete => sub {
#- LPD does not support filtered queues to a remote LPD server by itself
#- It needs an additional program as "rlpr"
- if ($printer->{SPOOLER} eq 'lpd') {$in->do_pkgs->install('rlpr');}
+ $printer->{SPOOLER} eq 'lpd' and $in->do_pkgs->install('rlpr');
1;
}
@@ -336,8 +336,7 @@ complete => sub {
join '', ("socket://$remotehost", $remoteport ? (":$remoteport") : ());
#- LPD and LPRng need netcat ('nc') to access to socket printers
- if (($printer->{SPOOLER} eq 'lpd') ||
- ($printer->{SPOOLER} eq 'lprng')) {$in->do_pkgs->install('nc');}
+ $printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng' and $in->do_pkgs->install('nc');
1;
}
@@ -742,8 +741,8 @@ sub main {
# printerdrake does not work without foomatic, and for more convenience
# we install some more stuff
if (!$::testing) {
- $in->do_pkgs->install(('foomatic', 'printer-utils','printer-testpages',
- ($in->do_pkgs->is_installed("gimp") ? 'gimpprint' : ())));
+ $in->do_pkgs->install('foomatic', 'printer-utils','printer-testpages',
+ if_($in->do_pkgs->is_installed('gimp'), 'gimpprint'));
}
# only experts should be asked for the spooler
n class="hl kwb">$s, %servers); my $quit; while (!$quit) { $quit = 1; sleep 1; while ($s = <$F2> || <$F3>) { $quit = 0; my ($ip, $name) = $s =~ /(\S+)\s+(\S+)/ or log::explanations("bad line in rpcinfo output"), next; $name =~ s/\.$//; $name =~ s/\Q.$domain\E$//; $servers{$ip} ||= { ip => $ip, if_($name ne '(unknown)', name => $name) }; } } values %servers; } sub find_exports { my ($_class, $server) = @_; my @l; run_program::raw({ timeout => 1 }, "showmount", '>', \@l, "--no-headers", "-e", $server->{ip} || $server->{name}); map { if_(/(\S+(\s*\S+)*)\s+(\S+)/, { name => $1, comment => $3, server => $server }) } @l; } 1;