From 3567c50a33be996d7a3f4fd6c622622105d55a51 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 10 Dec 2002 00:54:27 +0000 Subject: minimal perl_checker fixes to have only warnings --- perl-install/standalone/drakTermServ | 18 ++++++---------- perl-install/standalone/drakautoinst | 4 ++-- perl-install/standalone/drakbackup | 32 +++++++++++++-------------- perl-install/standalone/drakbug | 2 +- perl-install/standalone/drakconnect | 42 ++++++++++++++++++------------------ perl-install/standalone/drakfloppy | 6 +++--- perl-install/standalone/drakxtv | 2 +- perl-install/standalone/logdrake | 8 +++---- 8 files changed, 55 insertions(+), 59 deletions(-) (limited to 'perl-install') diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ index cef0b2a58..d5cfa9b6b 100755 --- a/perl-install/standalone/drakTermServ +++ b/perl-install/standalone/drakTermServ @@ -140,7 +140,7 @@ interactive_mode() if $#ARGV < 1; sub read_conf_file { if (-e $cfg_file) { - open (CONF_FILE, "<" . $cfg_file) || print "You must be root to read configuration file. \n"; + open(CONF_FILE, "<" . $cfg_file) || print "You must be root to read configuration file. \n"; while () { next unless /\S/; next if /^#/; @@ -456,7 +456,7 @@ sub help { A basic example of creating a boot floppy for a 3Com 3c509 manually: - cat /usr/lib/etherboot/boot1a.bin /\ + cat /usr/lib/etherboot/boot1a.bin \\ /usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0 @@ -1325,7 +1325,6 @@ sub deluser { # del a user from the shadow$$CLIENT$$ file my ($cmd_line, $username) = @_; my $i; - my $user; my $user_deleted; my @ts_users = cat_("/etc/shadow\$\$CLIENT\$\$"); @@ -1333,7 +1332,7 @@ sub deluser { if ($is_ts_user) { $i = 0; - foreach $user (@ts_users) { + foreach my $user (@ts_users) { if ($user =~ /$username/) { splice (@ts_users, $i, 1); $user_deleted = 1; @@ -1342,7 +1341,7 @@ sub deluser { $i++; } open(FHANDLE, "> /etc/shadow\$\$CLIENT\$\$"); - foreach $user (@ts_users) { + foreach my $user (@ts_users) { print FHANDLE "$user"; } close FHANDLE; @@ -1365,11 +1364,10 @@ sub addclient { my $host_in_use = 0; my $mac_in_use = 0; my $ip_in_use = 0; - my $client; my %ts_clients = read_dhcpd_conf(); - foreach $client(keys(%ts_clients)){ + foreach my $client(keys(%ts_clients)){ $host_in_use = 1 if ($hostname eq $client); $mac_in_use = 1 if ($mac eq $ts_clients{$client}{hardware}); $ip_in_use = 1 if ($ip eq $ts_clients{$client}{address}); @@ -1406,12 +1404,11 @@ sub addclient { sub delclient { #- find a client and delete the entry in dhcpd.conf my ($cmd_line, $hostname) = @_; - my $client; my $host_found; my %ts_clients = read_dhcpd_conf(); - foreach $client(keys(%ts_clients)){ + foreach my $client (keys(%ts_clients)){ if ($hostname eq $client) { $host_found = 1; delete $ts_clients{$client}; @@ -1500,10 +1497,9 @@ sub format_client_entry { sub write_dhcpd_conf { my %ts_clients = @_; my $clients = "/etc/dhcpd.conf.etherboot.clients"; - my $key; open(CLIENT, "> $clients") || warn ("Can't open $clients!"); - foreach $key(keys(%ts_clients)){ + foreach my $key(keys(%ts_clients)){ my $client_entry = format_client_entry($key, %ts_clients); print CLIENT $client_entry; } diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 88320483f..281a6c456 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -315,9 +315,9 @@ sub h2widget { sub create_entry_element { my ($text, $value, $label) = @_; my $e; - if(ref ($text) =~ /HASH/) { + if(ref $text =~ /HASH/) { return ([ "$label : ", h2widget($text, $label) ]); - } elsif (ref ($text) =~ /ARRAY/) { + } elsif (ref $text =~ /ARRAY/) { return ([ "$label : ", h2widget($text, $label) ]); } else { $e = new Gtk2::Entry; diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index 99771c78e..d996f88e9 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -600,7 +600,7 @@ sub save_cron_files { sub read_conf_file { if (-e $cfg_file) { # %config = getVarsFromSh($cfg_file) || print "You must be root to read configuration file. \n"; - open (CONF_FILE, "<" . $cfg_file) || print "You must be root to read configuration file. \n"; + open(CONF_FILE, "<" . $cfg_file) || print "You must be root to read configuration file. \n"; local $_; while () { next unless /\S/; @@ -1881,12 +1881,12 @@ sub advanced_where_cd { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please choose your CD/DVD device\n(Press Enter to propogate settings to other fields.\nThis field isn't necessary, only a tool to fill in the form.)")), $where_cd), 1, new Gtk2::VBox(0, 5), - 0, gtkset_sensitive(gtkset_size_request ($combo_where_cd_device, 200, 20), $where_cd), + 0, gtkset_sensitive(gtkset_size_request($combo_where_cd_device, 200, 20), $where_cd), ), 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please choose your CD/DVD media size (Mb)")), $where_cd), 1, new Gtk2::VBox(0, 5), - 0, gtkset_sensitive(gtkset_size_request ($combo_where_cd_time, 200, 20), $where_cd), + 0, gtkset_sensitive(gtkset_size_request($combo_where_cd_time, 200, 20), $where_cd), ), 0, new Gtk2::VBox(0, 5), 0, gtkpack_(new Gtk2::HBox(0,10), @@ -1930,8 +1930,8 @@ sub advanced_where_cd { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter your CD Writer device name\n ex: 0,1,0")), $where_cd), 1, new Gtk2::VBox(0, 5), -# 0, gtkset_size_request (gtkset_sensitive($cd_device_entry = new Gtk2::Entry(), $where_cd), 200, 20), - 0, gtkset_sensitive(gtkset_size_request ($combo_where_cdrecord_device, 200, 20), $where_cd), +# 0, gtkset_size_request(gtkset_sensitive($cd_device_entry = new Gtk2::Entry(), $where_cd), 200, 20), + 0, gtkset_sensitive(gtkset_size_request($combo_where_cdrecord_device, 200, 20), $where_cd), ), ), ); @@ -2003,7 +2003,7 @@ sub advanced_where_tape { my $box_where_tape; my $button; - my $adj = new Gtk2::Adjustment 550.0, 1.0, 10000.0, 1.0, 5.0, 0.0; + my $adj = new Gtk2::Adjustment(550.0, 1.0, 10000.0, 1.0, 5.0, 0.0); #my ($pix_fs_map, $pix_fs_mask) = gtkcreate_img("filedialog"); gtkpack($advanced_box, @@ -2014,7 +2014,7 @@ sub advanced_where_tape { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the device name to use for backup")), $where_tape), 1, new Gtk2::VBox(0, 6), - 0, gtkset_sensitive(gtkset_size_request ($combo_where_tape_device, 200, 20), $where_tape), + 0, gtkset_sensitive(gtkset_size_request($combo_where_tape_device, 200, 20), $where_tape), ), 0, new Gtk2::VBox(0, 5), 0, gtkpack_(new Gtk2::HBox(0,10), @@ -2038,7 +2038,7 @@ sub advanced_where_tape { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_tape), 1, new Gtk2::VBox(0, 6), - 0, gtkset_size_request (gtkset_sensitive(my $spinner = new Gtk2::SpinButton($adj, 0, 0), $where_tape), 200, 20), + 0, gtkset_size_request(gtkset_sensitive(my $spinner = new Gtk2::SpinButton($adj, 0, 0), $where_tape), 200, 20), ), 0, gtkpack_(new Gtk2::HBox(0,10),), ), @@ -2092,7 +2092,7 @@ sub advanced_where_hd { my ($previous_function) = @_, my $box_where_hd; my $button; - my $adj = new Gtk2::Adjustment 550.0, 1.0, 10000.0, 1.0, 5.0, 0.0; + my $adj = new Gtk2::Adjustment(550.0, 1.0, 10000.0, 1.0, 5.0, 0.0); gtkpack($advanced_box, $box_where_hd = gtkpack_(new Gtk2::VBox(0, 6), @@ -2102,7 +2102,7 @@ sub advanced_where_hd { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory to save to:")), $where_hd), 1, new Gtk2::VBox(0, 6), - 0, gtkset_size_request (gtkset_sensitive($save_path_entry = new Gtk2::Entry(), $where_hd), 152, 20), + 0, gtkset_size_request(gtkset_sensitive($save_path_entry = new Gtk2::Entry(), $where_hd), 152, 20), 0, gtkset_sensitive($button = gtksignal_connect(new Gtk2::Button(), clicked => sub { filedialog_where_hd() }), $where_hd), @@ -2111,7 +2111,7 @@ sub advanced_where_hd { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_hd), 1, new Gtk2::VBox(0, 6), - 0, gtkset_size_request (gtkset_sensitive(my $spinner = new Gtk2::SpinButton($adj, 0, 0), $where_hd), 200, 20), + 0, gtkset_size_request(gtkset_sensitive(my $spinner = new Gtk2::SpinButton($adj, 0, 0), $where_hd), 200, 20), ), 0, gtkpack_(new Gtk2::HBox(0,10), 1, new Gtk2::VBox(0, 6), @@ -3049,7 +3049,7 @@ sub restore_other_media_hd { my ($previous_function) = @_, my $box_where_hd; my $button; - my $adj = new Gtk2::Adjustment 550.0, 1.0, 10000.0, 1.0, 5.0, 0.0; + my $adj = new Gtk2::Adjustment(550.0, 1.0, 10000.0, 1.0, 5.0, 0.0); gtkpack($advanced_box, $box_where_hd = gtkpack_(new Gtk2::VBox(0, 6), @@ -3059,7 +3059,7 @@ sub restore_other_media_hd { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory to save:")), $where_hd), 1, new Gtk2::VBox(0, 6), - 0, gtkset_size_request (gtkset_sensitive($save_path_entry = new Gtk2::Entry(), $where_hd), 152, 20), + 0, gtkset_size_request(gtkset_sensitive($save_path_entry = new Gtk2::Entry(), $where_hd), 152, 20), 0, gtkset_sensitive($button = gtksignal_connect(new Gtk2::Button(), clicked => sub { filedialog_where_hd() }), $where_hd), ), @@ -3067,7 +3067,7 @@ sub restore_other_media_hd { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_hd), 1, new Gtk2::VBox(0, 6), - 0, gtkset_size_request (gtkset_sensitive(my $spinner = new Gtk2::SpinButton($adj, 0, 0), $where_hd), 200, 20), + 0, gtkset_size_request(gtkset_sensitive(my $spinner = new Gtk2::SpinButton($adj, 0, 0), $where_hd), 200, 20), ), 0, gtkpack_(new Gtk2::HBox(0,10), 1, new Gtk2::VBox(0, 6), @@ -3135,7 +3135,7 @@ sub restore_other_media { 0, gtkpack_(new Gtk2::HBox(0,10), 0, gtkset_sensitive(new Gtk2::Label(N("Please enter the directory where backups are stored")), $other_media_hd), 1, new Gtk2::VBox(0, 6), - 0, gtkset_size_request (gtkset_sensitive($restore_find_path_entry = new Gtk2::Entry(), $other_media_hd), 152, 20), + 0, gtkset_size_request(gtkset_sensitive($restore_find_path_entry = new Gtk2::Entry(), $other_media_hd), 152, 20), 0, gtkset_sensitive($button = gtksignal_connect(new Gtk2::Button(), clicked => sub { filedialog_restore_find_path(); }), $other_media_hd), @@ -4206,7 +4206,7 @@ sub install_rpm { my $box_what_user; gtkpack($advanced_box, $box_what_user = gtkpack_(new Gtk2::VBox(0, 15), - 0, N("The following packages need to be installed:\n @list_of_rpm_to_install"), + 0, N("The following packages need to be installed:\n") . join(' ', @list_of_rpm_to_install), 0, new Gtk2::HSeparator, 0, gtksignal_connect(new Gtk2::Button(N("Install")), clicked => sub { system("/usr/sbin/urpmi --X @list_of_rpm_to_install"); diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index d4c809d16..5084e2661 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -116,7 +116,7 @@ $Report_Button->signal_connect(clicked => sub { my $options = "mdkbugreport=1"; $options .= "&package=$p" if $p =~ /mdk/; $options .= "&kernel=$k"; $options .= "&version=$r"; - print $bugzilla_url . "?" . $options . "\n"; + print($bugzilla_url . "?" . $options . "\n"); connect_bugzilla($bugzilla_url."?".$options) }); $hbx->pack_end($Report_Button,0,0,0); $vbx->pack_start($hbx,0,0,0); diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 2364434dc..2f02aa659 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -102,14 +102,14 @@ $button_del->signal_connect(clicked => sub { my $bbox_dialog = new Gtk2::HButtonBox; $dialog->action_area->add($bbox_dialog); $bbox_dialog->set_layout('end'); - my $button_ok = new Gtk2::Button N("OK"); + my $button_ok = new Gtk2::Button(N("OK")); $button_ok->signal_connect (clicked => sub { network::netconnect::del_profile($netcnx, $combo_dialog->entry->get_text()); $netcnx->{PROFILE} eq $combo_dialog->entry->get_text() and $netcnx->{PROFILE} = "default"; Gtk->main_quit(); }); $bbox_dialog->add($button_ok); - my $button_cancel = new Gtk2::Button N("Cancel"); + my $button_cancel = new Gtk2::Button(N("Cancel")); $button_cancel->signal_connect (clicked => sub { Gtk->main_quit() }); $bbox_dialog->add($button_cancel); $dialog->show_all; @@ -134,14 +134,14 @@ $button_new->signal_connect(clicked => sub { my $bbox_dialog = new Gtk2::HButtonBox; $dialog->action_area->add($bbox_dialog); $bbox_dialog->set_layout('end'); - my $button_ok = new Gtk2::Button N("OK"); + my $button_ok = new Gtk2::Button(N("OK")); $button_ok->signal_connect (clicked => sub { network::netconnect::add_profile($netcnx, $entry_dialog->get_text()); $netcnx->{PROFILE} = $entry_dialog->get_text(); Gtk->main_quit(); }); $bbox_dialog->add($button_ok); - my $button_cancel = new Gtk2::Button N("Cancel"); + my $button_cancel = new Gtk2::Button(N("Cancel")); $button_cancel->signal_connect (clicked => sub { Gtk->main_quit() }); $bbox_dialog->add($button_cancel); $dialog->show_all; @@ -161,12 +161,12 @@ $hbox2->pack_start($label_host,0,0,0); #$vbox1->pack_start(new Gtk2::HSeparator,1,1,5); -my $frame1 = new Gtk2::Frame (N("Internet access")); +my $frame1 = new Gtk2::Frame(N("Internet access")); $vbox1->pack_start($frame1,1,1,0); my $vbox_frame1 = new Gtk2::VBox(0,0); $vbox_frame1->set_border_width(5); $frame1->add($vbox_frame1); -my $table1 = new Gtk2::Table (3,3, 0); +my $table1 = new Gtk2::Table(3,3, 0); $table1->set_border_width(5); $table1->set_row_spacings(5); $table1->set_col_spacings(5); @@ -220,7 +220,7 @@ $vbox_frame1->pack_start($hbox_frame1_button,0,0,0); #$vbox1->pack_start(new Gtk2::HSeparator,1,1,5); -my $frame2 = new Gtk2::Frame (N("LAN configuration")); +my $frame2 = new Gtk2::Frame(N("LAN configuration")); $vbox1->pack_start($frame2,1,1,0); my $vbox2 = new Gtk2::VBox(0,0); $vbox2->set_border_width(5); @@ -250,7 +250,7 @@ $bbox0->set_layout('end'); $bbox0->add(new Gtk2::Label(N("Click here to launch the wizard ->"))); -my $button_wizard = new Gtk2::Button N("Wizard..."); +my $button_wizard = new Gtk2::Button(N("Wizard...")); $button_wizard->signal_connect(clicked => sub { $::isWizard = 1; system("drakconnect --wizard"); @@ -268,7 +268,7 @@ $vbox1->pack_start($bbox1,0,0,0); $bbox1->set_layout('end'); #$bbox1->set_border_width(5); -my $button_expert = new Gtk2::Button N("Expert Mode"); +my $button_expert = new Gtk2::Button(N("Expert Mode")); $button_expert->signal_connect (clicked => sub { foreach ($button1, $button3) { $expert_mode ? $_->hide() : $_->show() } $button_expert->child->set($expert_mode ? N("Expert Mode") : N("Normal Mode")); @@ -276,21 +276,21 @@ $button_expert->signal_connect (clicked => sub { }); $bbox1->add($button_expert); -my $button_apply = new Gtk2::Button N("Apply"); +my $button_apply = new Gtk2::Button(N("Apply")); $button_apply->signal_connect (clicked => sub { apply(); }); $button_apply->set_sensitive(0); $bbox1->add($button_apply); -my $button_cancel = new Gtk2::Button N("Cancel"); +my $button_cancel = new Gtk2::Button(N("Cancel")); $button_cancel->signal_connect (clicked => sub { $combo1->entry->set_text($old_profile); update(); quit_global(); }); $bbox1->add($button_cancel); -my $button_ok = new Gtk2::Button N("OK"); +my $button_ok = new Gtk2::Button(N("OK")); $button_ok->signal_connect (clicked => sub { my $dialog = new Gtk2::Dialog(); $dialog->set_position('center'); @@ -353,7 +353,7 @@ sub apply { $netcnx->{type} eq 'isdn_external' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, ''); my $a = $netcnx->{type}; $a =~ s/adsl_//; - $netcnx->{type} =~ 'adsl' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, $a, $netcnx); + $netcnx->{type} =~ /adsl/ and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, $a, $netcnx); $netcnx->{dhcp_client} and $netc->{dhcp_client} = $netcnx->{dhcp_client}; network::configureNetwork2($in, $prefix, $netc, $intf); @@ -429,7 +429,7 @@ Configure them first by clicking on 'Configure'")),1,1,0); my $bbox_dialog = new Gtk2::HButtonBox; $dialog->action_area->add($bbox_dialog); $bbox_dialog->set_layout('end'); - my $button_ok = new Gtk2::Button N("OK"); + my $button_ok = new Gtk2::Button(N("OK")); $button_ok->signal_connect (clicked => sub { Gtk->main_quit() }); $bbox_dialog->add($button_ok); $dialog->show_all; @@ -558,7 +558,7 @@ Create one first by clicking on 'Configure'")),1,1,0); my $bbox_dialog = new Gtk2::HButtonBox; $dialog->action_area->add($bbox_dialog); $bbox_dialog->set_layout('end'); - my $button_ok = new Gtk2::Button N("OK"); + my $button_ok = new Gtk2::Button(N("OK")); $button_ok->signal_connect (clicked => sub { Gtk->main_quit(); }); @@ -584,7 +584,7 @@ Create one first by clicking on 'Configure'")),1,1,0); $vbox1->pack_start(new Gtk2::Label(N("Internet Connection Configuration")),0,1,0); $vbox1->pack_start(new Gtk2::HSeparator,0,0,5); - my $table1 = new Gtk2::Table (2, 4, 0); + my $table1 = new Gtk2::Table(2, 4, 0); $table1->set_row_spacings(5); $table1->set_col_spacings(5); $vbox1->pack_start($table1,0,0,0); @@ -596,7 +596,7 @@ Create one first by clicking on 'Configure'")),1,1,0); # $table1->attach($button1, 2, 4, 0, 2, 'fill', 'fill',0,0); $vbox1->pack_start(new Gtk2::HSeparator,0,0,5); - my $frame1 = new Gtk2::Frame (N("Parameters")); + my $frame1 = new Gtk2::Frame(N("Parameters")); $vbox1->pack_start($frame1,1,1,0); my $vbox2 = new Gtk2::VBox(0,0); $frame1->add($vbox2); @@ -654,7 +654,7 @@ Create one first by clicking on 'Configure'")),1,1,0); @mask = (0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,1,1) if $netcnx->{type} eq'isdn_internal'&& defined $cnx->{vendor} && defined $cnx->{id}; @mask = (1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,1,1) if $netcnx->{type} eq'isdn_internal'&&(!defined $cnx->{vendor}||!defined $cnx->{id}); @mask = (0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0) if ($netcnx->{type} eq 'modem'||$netcnx->{type} eq 'isdn_external'); -@mask = (0,0,0,0,0,0,1,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0) if $netcnx->{type} =~ 'adsl'; +@mask = (0,0,0,0,0,0,1,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0) if $netcnx->{type} =~ /adsl/; @mask = (0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0) if $netcnx->{type} eq 'cable'; $vbox1->pack_start(new Gtk2::HSeparator,0,0,5); @@ -662,7 +662,7 @@ Create one first by clicking on 'Configure'")),1,1,0); my $bbox1 = new Gtk2::HButtonBox; $vbox1->pack_start($bbox1,0,0,0); $bbox1->set_layout('end'); - my $button_ok = new Gtk2::Button N("OK"); + my $button_ok = new Gtk2::Button(N("OK")); $button_ok->signal_connect (clicked => sub { $i = 0; foreach (@mask) { @@ -674,8 +674,8 @@ Create one first by clicking on 'Configure'")),1,1,0); $window->destroy(); Gtk->main_quit; }); $bbox1->add($button_ok); - my $button_cancel = new Gtk2::Button N("Cancel"); - $button_cancel->signal_connect (clicked => sub { $window->destroy(); Gtk->main_quit }); + my $button_cancel = new Gtk2::Button(N("Cancel")); + $button_cancel->signal_connect(clicked => sub { $window->destroy(); Gtk->main_quit }); $bbox1->add($button_cancel); $window->set_modal(1); diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index b99012370..0ac4c4160 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -63,10 +63,10 @@ my $global_vbox = new Gtk::VBox(); $global_vbox->pack_start(new Gtk::Label(N("boot disk creation")), 0, 0, 0) unless $::isEmbedded; ######## up part -my $up_vbox = new Gtk::VBox (0, 0); +my $up_vbox = new Gtk::VBox(0, 0); # device part -my $dev_hbox = new Gtk::HBox (1, 0); +my $dev_hbox = new Gtk::HBox(1, 0); my $device_combo = new Gtk::Combo(); my $device_button = new Gtk::Button(N("default")); @@ -79,7 +79,7 @@ $dev_hbox->pack_start($device_button, 0, 0, 0); $up_vbox->pack_start($dev_hbox, 0, 0, 0); # kernel part -my $ker_hbox = new Gtk::HBox (1, 0); +my $ker_hbox = new Gtk::HBox(1, 0); my $kernel_combo = new Gtk::Combo(); my $kernel_button = new Gtk::Button(N("default")); $kernel_combo->disable_activate(); diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 75f122f99..b3f9c8802 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -133,7 +133,7 @@ my @devices = grep { ($_->{media_type} eq 'MULTIMEDIA_VIDEO') || $_->{driver} eq if (@devices) { # TODO: That need some work for multiples TV cards foreach (@devices) { - if (( $< == 0) && (grep { $_->{driver} =~ '(bttv|saa7134)' } @devices)) { + if (( $< == 0) && (grep { $_->{driver} =~ /(bttv|saa7134)/ } @devices)) { require harddrake::v4l; require modules; no strict 'subs'; diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index ae217bbce..492861dd6 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -192,7 +192,7 @@ gtkadd($my_win->{window}, create_scrolled_window($log_text) )) : (1, create_scrolled_window($log_text)), if_(!$::isExplain, 0, gtkadd (gtkset_border_width(gtkset_layout(Gtk2::HButtonBox->new, 'end'), 5), - if_(!$::isFile, gtksignal_connect(new Gtk2::Button (N("Mail alert")), + if_(!$::isFile, gtksignal_connect(new Gtk2::Button(N("Mail alert")), clicked => sub { eval { alert_config() }; if ($@ =~ /wizcancel/) { $::Wizard_no_previous = 1; @@ -200,8 +200,8 @@ gtkadd($my_win->{window}, $::WizardWindow->destroy if defined $::WizardWindow; undef $::WizardWindow; } })), - gtksignal_connect(new Gtk2::Button (N("Save")), clicked => \&save), - gtksignal_connect(new Gtk2::Button ($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit) + gtksignal_connect(new Gtk2::Button(N("Save")), clicked => \&save), + gtksignal_connect(new Gtk2::Button($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit) ) ) ) @@ -383,7 +383,7 @@ my $r = "*** ". chomp_(`date`) . " ***\n"; my $initdir = "/etc/init.d"; - my ($load,$mail,$email,$smtp,); + my ($load,$mail,$email,$smtp); $load = 3; begin: -- cgit v1.2.1