summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-10-17 14:52:06 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-10-17 14:52:06 +0000
commit456fce5f38d3a6222ceac1607c9d9210669f8781 (patch)
tree79d41548253c3d58f693878c98766aada183defc
parent63d3fd5d25fd96cd428456099b9b2353db4e10cc (diff)
downloaddrakx-456fce5f38d3a6222ceac1607c9d9210669f8781.tar
drakx-456fce5f38d3a6222ceac1607c9d9210669f8781.tar.gz
drakx-456fce5f38d3a6222ceac1607c9d9210669f8781.tar.bz2
drakx-456fce5f38d3a6222ceac1607c9d9210669f8781.tar.xz
drakx-456fce5f38d3a6222ceac1607c9d9210669f8781.zip
start to consolidate %spoolers as a data structure
-rw-r--r--perl-install/printer.pm41
1 files changed, 21 insertions, 20 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index c64890ed5..6289688ee 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -22,6 +22,21 @@ my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
#-Did we already read the subroutines of /usr/sbin/ptal-init?
my $ptalinitread = 0;
+my %spoolers = ('ppq' => {
+ 'help' => "/usr/bin/lphelp %s |",
+ 'print_command' => 'lpr-pdq'
+ },
+ 'lpd' => {
+ 'help' => "/usr/bin/pdq -h -P %s 2>&1 |"
+ 'print_command' => 'lpr-cups'
+ },
+ 'lprng' => {
+ 'print_command' => 'lpr-lpd'
+ },
+ 'cups' => {
+ 'print_command' => 'lpr-cups'
+ }
+ );
%spooler = (
_("CUPS - Common Unix Printing System") => "cups",
_("LPRng - LPR New Generation") => "lprng",
@@ -38,13 +53,6 @@ my $ptalinitread = 0;
);
%shortspooler_inv = reverse %shortspooler;
-%lprcommand = (
- "cups" => "lpr-cups",
- "lprng" => "lpr-lpd",
- "lpd" => "lpr-lpd",
- "pdq" => "lpr-pdq"
-);
-
%printer_type = (
_("Local printer") => "LOCAL",
_("Remote printer") => "REMOTE",
@@ -1687,13 +1695,6 @@ sub print_pages($@) {
sub help_output {
my ($printer, $spooler) = @_;
- my %spoolers = ('lpq' => {
- 'help' => "/usr/bin/lphelp %s |"
- },
- 'lp' => {
- 'help' => "/usr/bin/pdq -h -P %s 2>&1 |"
- }
- );
my $queue = $printer->{QUEUE};
local *F;
@@ -2371,7 +2372,7 @@ sub configurestaroffice {
("ports", "default_queue=", $configfilecontent);
$configfilecontent = addentry
("ports",
- "default_queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}}",
+ "default_queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}{print_command}}",
$configfilecontent);
# Write back Star Office configuration file
return writesofficeconfigfile($configfilename, $configfilecontent);
@@ -2444,7 +2445,7 @@ sub configureopenoffice {
("Generic Printer", "Command=", $configfilecontent);
$configfilecontent = addentry
("Generic Printer",
- "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}}",
+ "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}{print_command}}",
$configfilecontent);
# Write back OpenOffice.org configuration file
return writesofficeconfigfile($configfilename, $configfilecontent);
@@ -2640,7 +2641,7 @@ sub makestarofficeprinterentry {
# symbol correctly.
$configfile = removeentry("ports", "$queue=", $configfile);
$configfile = addentry("ports",
- "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}} -P $queue",
+ "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}{print_command}} -P $queue",
$configfile);
# Make printer's section
$configfile = addsection("$queue,PostScript,$queue", $configfile);
@@ -2707,7 +2708,7 @@ sub makeopenofficeprinterentry {
# symbol correctly.
$configfile = removeentry($queue, "Command=", $configfile);
$configfile = addentry($queue,
- "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}} -P $queue",
+ "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/$lprcommand{$printer->{SPOOLER}{print_command}} -P $queue",
$configfile);
# "Comment" line
$configfile = removeentry($queue, "Comment=", $configfile);
@@ -3155,7 +3156,7 @@ sub makegimpprinterentry {
$configfile = removegimpentry($queue,
"Destination:", $configfile);
$configfile = addgimpentry($queue,
- "Destination: /usr/bin/$lprcommand{$printer->{SPOOLER}} -P $queue -o raw", $configfile);
+ "Destination: /usr/bin/$lprcommand{$printer->{SPOOLER}{print_command}} -P $queue -o raw", $configfile);
} else {
$configfile = removegimpentry($queue,
"PPD-File:", $configfile);
@@ -3168,7 +3169,7 @@ sub makegimpprinterentry {
$configfile = removegimpentry($queue,
"Destination:", $configfile);
$configfile = addgimpentry($queue,
- "Destination: /usr/bin/$lprcommand{$printer->{SPOOLER}} -P $queue", $configfile);
+ "Destination: /usr/bin/$lprcommand{$printer->{SPOOLER}{print_command}} -P $queue", $configfile);
}
return $configfile;
}