drakx-backup-do-not-use - Mageia Installer and base platform for many utilities

Mageia Installer and base platform for many utilities

Thierry Vignaud [tv]

diff options

author	Pascal Rigaux <pixel@mandriva.com>	2004-01-08 17:27:56 +0000
committer	Pascal Rigaux <pixel@mandriva.com>	2004-01-08 17:27:56 +0000
commit	85f7d9cca33fdfb0688789e4116db9f0b1c88fa5 (patch)
tree	804f95237b28edd1422d71ab2d7e8a8dfee2ce59 /tools/ddcprobe
parent	4864f1a708acc8cf939fcd2ddff6d8c91ca2b6cb (diff)
download	drakx-backup-do-not-use-85f7d9cca33fdfb0688789e4116db9f0b1c88fa5.tar drakx-backup-do-not-use-85f7d9cca33fdfb0688789e4116db9f0b1c88fa5.tar.gz drakx-backup-do-not-use-85f7d9cca33fdfb0688789e4116db9f0b1c88fa5.tar.bz2 drakx-backup-do-not-use-85f7d9cca33fdfb0688789e4116db9f0b1c88fa5.tar.xz drakx-backup-do-not-use-85f7d9cca33fdfb0688789e4116db9f0b1c88fa5.zip

add formatError_and_log (to get log'ing even now that SIG{__DIE__} is not there anymore)

Diffstat (limited to 'tools/ddcprobe')

0 files changed, 0 insertions, 0 deletions

e summary='diff' class='diff'>

diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index d152a2cad..0a339adf6 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake

@@ -29,7 +29,7 @@ use c;

$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;

local $_ = join '', @ARGV;

-/-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";

+/-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing] [--cups] [--lprng] [--lpd] [--pdq]\n";

$::beginner = /-beginner/;

$::expert = /-expert/;

@@ -42,27 +42,29 @@ my $printer;

my $in = 'interactive'->vnew('su', 'printer');

+my $commandline = $_;

{

my $w = $in->wait_message('', _("Reading printer data ..."));

# Get what was installed before

eval { $printer = printer::getinfo('') };

# Choose the spooler by command line options

-/-cups/ and

+$commandline =~ /-cups/ and

$printer->{SPOOLER} = 'cups' and printer::read_configured_queues($printer);

-/-lpr/ and

+$commandline =~ /-lpr/ and

$printer->{SPOOLER} = 'lpd' and printer::read_configured_queues($printer);

-/-lpd/ and

+$commandline =~ /-lpd/ and

$printer->{SPOOLER} = 'lpd' and printer::read_configured_queues($printer);

-/-lprng/ and

+$commandline =~ /-lprng/ and

$printer->{SPOOLER} ='lprng' and printer::read_configured_queues($printer);

-/-pdq/ and

+$commandline =~ /-pdq/ and

$printer->{SPOOLER} = 'pdq' and printer::read_configured_queues($printer);

-r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf');

}

begin:

$::isEmbedded and kill USR2, $::CCPID;

printerdrake::main($printer, $in, 1);

$::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);