summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-10-17 14:57:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-10-17 14:57:21 +0000
commit1a2817258d38ed3a412e74c0ef141daa160f1008 (patch)
tree256670f18b94f54a74434941f070170319c691de
parent456fce5f38d3a6222ceac1607c9d9210669f8781 (diff)
downloaddrakx-1a2817258d38ed3a412e74c0ef141daa160f1008.tar
drakx-1a2817258d38ed3a412e74c0ef141daa160f1008.tar.gz
drakx-1a2817258d38ed3a412e74c0ef141daa160f1008.tar.bz2
drakx-1a2817258d38ed3a412e74c0ef141daa160f1008.tar.xz
drakx-1a2817258d38ed3a412e74c0ef141daa160f1008.zip
setup_common: consolidate regexp
-rw-r--r--perl-install/printerdrake.pm14
1 files changed, 3 insertions, 11 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 7a4a21d29..312ccff2d 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1320,15 +1320,7 @@ sub setup_common {
$isHPOJ = $in->ask_yesorno(_("Add a new printer"),
_("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
}
- if (($makemodel =~ /HP\s+OfficeJet/i) ||
- ($makemodel =~ /HP\s+PSC/i) ||
- ($makemodel =~ /HP\s+PhotoSmart/i) ||
- ($makemodel =~ /HP\s+LaserJet\s+1100/i) ||
- ($makemodel =~ /HP\s+LaserJet\s+1200/i) ||
- ($makemodel =~ /HP\s+LaserJet\s+1220/i) ||
- ($makemodel =~ /HP\s+LaserJet\s+2200/i) ||
- ($makemodel =~ /HP\s+LaserJet\s+3200/i) ||
- ($makemodel =~ /HP\s+LaserJet\s+33.0/i) ||
+ if (($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0))/i) ||
($makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i) ||
($isHPOJ)) {
# Install HPOJ package
@@ -2343,11 +2335,11 @@ The \"%s\" command also allows to modify the option settings for a particular pr
(!$cupsremote ?
_("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s
-", $scanning, $photocard) . printer::help_output($printer, 'lp') :
+", $scanning, $photocard) . printer::help_output($printer, 'lpd') :
$scanning . $photocard .
_("Here is a list of the available printing options for the current printer:
-") . printer::help_output($printer, 'lp')) : $scanning . $photocard);
+") . printer::help_output($printer, 'lpd')) : $scanning . $photocard);
} elsif ($spooler eq "lprng") {
$dialogtext =
_("To print a file from the command line (terminal window) use the command \"%s <file>\".