summaryrefslogtreecommitdiffstats
path: root/perl-install/harddrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-11-11 19:11:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-11-11 19:11:59 +0000
commitbfd84f6e2df1b083c8d95f6f8a84ede73d36dfea (patch)
tree42b0132d629d68fffde6b0e828126c18c0c3d1ed /perl-install/harddrake
parent195f44c2da47b9f0df0461b593935d89619a5a0e (diff)
downloaddrakx-backup-do-not-use-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar
drakx-backup-do-not-use-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar.gz
drakx-backup-do-not-use-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar.bz2
drakx-backup-do-not-use-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar.xz
drakx-backup-do-not-use-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.zip
add or remove spaces where need to please perl_checker
Diffstat (limited to 'perl-install/harddrake')
-rw-r--r--perl-install/harddrake/data.pm32
-rw-r--r--perl-install/harddrake/sound.pm6
-rw-r--r--perl-install/harddrake/ui.pm10
-rw-r--r--perl-install/harddrake/v4l.pm10
4 files changed, 29 insertions, 29 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 5dcf3e372..e4c2b8062 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -11,7 +11,7 @@ my @devices = detect_devices::probeall(1);
# Update me each time you handle one more devices class (aka configurator)
sub unknown {
- grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB/} @devices;
+ grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB/ } @devices;
}
@@ -23,15 +23,15 @@ our @tree =
(
["FLOPPY","Floppy", "floppy.png", "",\&detect_devices::floppies, 0 ],
["HARDDISK","Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ],
- ["CDROM","CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms } , 0 ],
+ ["CDROM","CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms }, 0 ],
["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners(), 0 ],
["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms() }, 0 ],
["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ],
- ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices}, 0 ],
- ["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices}, 0 ],
- ["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ],
- ["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ],
+ ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices }, 0 ],
+ ["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices }, 0 ],
+ ["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices }, 0 ],
+ ["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI' } @devices }, 0 ],
["CPU","Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub {
#- generic NIC detection for USB seems broken (class, subclass,
@@ -40,26 +40,26 @@ our @tree =
my @usbnet = qw(CDCEther catc kaweth pegasus usbnet);
# should be taken from detect_devices.pm or modules.pm. it's identical
- grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices}, 1 ],
- ["MODEM","Modem", "modem.png", "", sub { detect_devices::getModem() } , 0 ],
- ["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ],
- ["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ],
+ grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices }, 1 ],
+ ["MODEM","Modem", "modem.png", "", sub { detect_devices::getModem() }, 0 ],
+ ["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices }, 0 ],
+ ["UNKNOWN","Unknown/Others", "unknown.png", "", \&unknown, 0 ],
["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", sub {
- require printerdrake; printerdrake::detect() } , 0 ],
+ require printerdrake; printerdrake::detect() }, 0 ],
["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub {
require scanner; scanner::detect() }, 0 ],
["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub {
require mouse;
require modules;
modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
- &mouse::detect() } , 1 ],
+ &mouse::detect() }, 1 ],
["JOYSTICK","Joystick", "joystick.png", "", sub {}, 0 ],
- ["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_(IDE|OTHER)' } @devices}, 0 ],
- ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_SCSI' } @devices}, 0 ],
- ["USB_CONTROLLER","USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_USB' } @devices}, 0 ],
- ["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_SMBUS' } @devices}, 0 ],
+ ["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_(IDE|OTHER)' } @devices }, 0 ],
+ ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_SCSI' } @devices }, 0 ],
+ ["USB_CONTROLLER","USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_USB' } @devices }, 0 ],
+ ["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_SMBUS' } @devices }, 0 ],
);
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 48e8ffbff..15d7ad7df 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -178,7 +178,7 @@ sub switch {
"$_[0] (". $des{$_[0]} . ')'
}, allow_empty_list => 1 },
{
- val => N("Help"), disabled => sub { },
+ val => N("Help"), disabled => sub {},
clicked => sub {
$in->ask_warn(N("Switching between ALSA and OSS help"),
N("OSS (Open Sound System) was the first sound API. It's an OS independant sound API (it's available on most unices systems) but it's a very basic and limited API.
@@ -213,8 +213,8 @@ The new \"%s\" driver'll only be used on next bootstrap.", $driver, $new_driver)
N("The \"%s\" driver for your sound card is unlisted\n
Please send the output of the \"lspcidrake -v\" command to
<install at mandrakesoft dot com>
-with subject: unlisted sound driver \"%s\"")
- , $driver, $driver);
+with subject: unlisted sound driver \"%s\""),
+ $driver, $driver);
}
}
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 882f0bc1a..c4009e5e9 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -94,7 +94,7 @@ my @menu_items =
if ($current_device) {
$in->ask_warn(N("Harddrake help"),
N("Description of the fields:\n\n")
- . join("\n\n", map { if_($fields{$_}[0], "$fields{$_}[0]: $fields{$_}[1]")} sort keys %$current_device))
+ . join("\n\n", map { if_($fields{$_}[0], "$fields{$_}[0]: $fields{$_}[1]") } sort keys %$current_device))
} else {
$in->ask_warn(N("Select a device !"), N("Once you've selected a device, you'll be able to see explanations on fields displayed on the right frame (\"Information\")"))
}
@@ -106,7 +106,7 @@ my @menu_items =
callback => sub {
$in->ask_warn(N("About Harddrake"),
join ("", N("This is HardDrake, a Mandrake hardware configuration tool.\nVersion:"), " $harddrake::data::version\n",
- N("Author:"), " Thierry Vignaud <tvignaud\@mandrakesoft.com> \n\n" ,
+ N("Author:"), " Thierry Vignaud <tvignaud\@mandrakesoft.com> \n\n",
formatAlaTeX($license)));
}
}
@@ -132,7 +132,7 @@ sub detect {
if (exists $_->{bus} && $_->{bus} eq "PCI") {
my $i = $_;
$_->{bus_id} = join ':', map { if_($i->{$_} ne "65535", sprintf("%lx", $i->{$_})) } qw(vendor id subvendor subid);
- $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_} ) } qw(pci_bus pci_device pci_function);
+ $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(pci_bus pci_device pci_function);
}
# split description into manufacturer/description
($_->{Vendor}, $_->{description}) = split(/\|/,$_->{description}) if exists $_->{description};
@@ -148,7 +148,7 @@ sub detect {
} elsif ((exists $_->{id}) && ($_->{bus} ne 'PCI')) {
# SCSI detection incoherency:
my $i = $_;
- $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_} ) } qw(bus id);
+ $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(bus id);
}
if ($Ident eq "AUDIO") {
require harddrake::sound;
@@ -249,7 +249,7 @@ sub new {
if ($pid = fork()) {
$sig_id = $statusbar->push($statusbar->get_context_id("id"), N("Running \"%s\" ...", $configurator));
} else { exec($configurator) or die "$configurator missing\n" }
- }) ;
+ });
$config_button->show;
} else {
$text->backward_delete($text->get_point); # erase all previous text
diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index 47cce15cf..2ec3f36d0 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -209,12 +209,12 @@ sub config {
if ($in->ask_from("BTTV configuration", N("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.
If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed"),
[
- { label => N("Card model:"), val => \$conf{card}, list => [keys %{$cards_lst->{$driver}}], type => 'combo', default => -1, sort =>1, separator => '|'},
- { label => N("Tuner type:"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|'},
- { label => N("Number of capture buffers:"), val => \$conf{gbuffers}, min=>2, max=>32, sort => 1, default => 0, type=>'range', advanced =>1, help => N("number of capture buffers for mmap'ed capture")},
+ { label => N("Card model:"), val => \$conf{card}, list => [keys %{$cards_lst->{$driver}}], type => 'combo', default => -1, sort =>1, separator => '|' },
+ { label => N("Tuner type:"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|' },
+ { label => N("Number of capture buffers:"), val => \$conf{gbuffers}, min => 2, max => 32, sort => 1, default => 0, type => 'range', advanced => 1, help => N("number of capture buffers for mmap'ed capture") },
if_($driver eq 'bttv',
- { label => N("PLL setting:"), val => \$conf{pll}, list => [keys %pll_lst], format => sub { $pll_lst{$_[0]} }, sort => 1, default => 0, advanced =>1},
- { label => N("Radio support:"), val => \$conf{radio}, type => "bool", text => N("enable radio support")}),
+ { label => N("PLL setting:"), val => \$conf{pll}, list => [keys %pll_lst], format => sub { $pll_lst{$_[0]} }, sort => 1, default => 0, advanced =>1 },
+ { label => N("Radio support:"), val => \$conf{radio}, type => "bool", text => N("enable radio support") }),
]
))
{