perl_checker fixes

6 files changed, 20 insertions, 20 deletions

diff --git a/perl-install/harddrake/TODO b/perl-install/harddrake/TODO
index 2928dc2a5..dc7614802 100644
--- a/perl-install/harddrake/TODO
+++ b/perl-install/harddrake/TODO
@@ -22,7 +22,7 @@
 ** fixes
 *** configure at boot-time (hw hooks shared by both harddrake & drakx ?):
     all /etc/modules aliases 
-**** usb-interfaces 
+**** usb-interfaces (or rewrite usb service in perl for speed)
 **** snd cards
 **** switch nvidia/nv in /etc/X11/XF86Config
      if [[ -e /lib/modules/`uname -r`/kernel/drivers/video/NVdriver ]]; then
@@ -39,7 +39,7 @@
 *** new dvd driver : offer to install xine||mplayer
 *** draksound :
 **** add a dialog so that the user choose its wavetable.
-**** add a dialog so that the user is able to pick any driver
+**** add a dialog so that the user is able to pick any driver if no sound card present
 **** list all availables drivers, defaulting to first alternative, prepending old one with '*'
 **** add 'ALSA/OSS': tag to modules list
 ** detect engine:
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 328c9437b..1c10b680a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -163,7 +163,7 @@ If you don't want to use the auto detection, deselect the checkbox.
 			  { label => N("Use auto detection"), val => \$netc->{autodetection}, type => 'bool' },
 			  if_($::isStandalone, { label => N("Expert Mode"), val => \$::expert, type => 'bool' }),
 			 ]
-			) or goto step_5; }; $in->exit(0) if $@ =~ /wizcancel/;
+			) or goto step_5 }; $in->exit(0) if $@ =~ /wizcancel/;
     undef $::Wizard_no_previous;
     set_profile($netcnx);
     if ($netc->{autodetection}) {
@@ -212,7 +212,7 @@ If you don't want to use the auto detection, deselect the checkbox.
 	eval { $in->ask_from(N("Network Configuration Wizard"),
 			     N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center"),
 			     [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ] } ]
-			    ) or goto step_2; }; $in->exit(0) if $@ =~ /wizcancel/;
+			    ) or goto step_2 }; $in->exit(0) if $@ =~ /wizcancel/;
     } elsif ($nb == 1) {
 	$netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0];
     }
@@ -256,7 +256,7 @@ Test your connection via net_monitor or mcc. If your connection doesn't work, yo
     if ($::isWizard) {
 	$::Wizard_no_previous = 1;
 	$::Wizard_finished = 1;
-	eval { $in->ask_okcancel(N("Network Configuration"), $m, 1); }; $in->exit(0) if $@ =~ /wizcancel/;
+	eval { $in->ask_okcancel(N("Network Configuration"), $m, 1) }; $in->exit(0) if $@ =~ /wizcancel/;
 	undef $::Wizard_no_previous;
 	undef $::Wizard_finished;
     } else { $::isStandalone and $in->ask_warn('', $m) }
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index d156f257e..f182d8013 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -70,7 +70,7 @@ sub write_conf {
 		     if_(!$netc->{DHCP}, HOSTNAME => "localhost.$netc->{DOMAINNAME}"),
 		    });
 
-    setVarsInSh($file, $netc, if_(!$netc->{DHCP}, HOSTNAME), qw(NETWORKING FORWARD_IPV4 DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN));
+    setVarsInSh($file, $netc, if_(!$netc->{DHCP}, 'HOSTNAME'), qw(NETWORKING FORWARD_IPV4 DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN));
 }
 
 sub write_resolv_conf {
@@ -146,7 +146,7 @@ sub write_interface_conf {
     
     $intf->{BOOTPROTO} =~ s/dhcp.*/dhcp/; #- TODO: avoid obfuscating BOOTPROTO, waiting for zeroconf conf details 
 
-    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR), if_($intf->{wireless_eth}, qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV)), if_($dhcp_hostname, DHCP_HOSTNAME), if_(!$dhcp_hostname, NEEDHOSTNAME));
+    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR), if_($intf->{wireless_eth}, qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV)), if_($dhcp_hostname, 'DHCP_HOSTNAME'), if_(!$dhcp_hostname, 'NEEDHOSTNAME'));
 }
 
 sub add2hosts {
@@ -330,9 +330,9 @@ notation (for example, 1.2.3.4).");
 	         ],
 	         complete => sub {
 			 $intf->{BOOTPROTO} = $pump ? if_($dhcp, "dhcp") . if_($zeroconf, "zeroconf") : "static";
-			 if ($pump and !$dhcp and !$zeroconf ) { 
+			 if ($pump and !$dhcp and !$zeroconf) {
 			     $in->ask_warn('', N("For an Automatic IP you have to select at least one protocol : dhcp or zeroconf"));
-			     return (1,$i);
+			     return 1;
 			 }
 			 return 0 if $pump;
 	         	 for (my $i = 0; $i < @fields; $i++) {
@@ -433,7 +433,7 @@ sub read_all_conf {
 }
 
 sub easy_dhcp {
-    my ($in, $netc, $intf) = @_;
+    my ($_in, $netc, $intf) = @_;
 
     return if text2bool($netc->{NETWORKING});
 
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 725212e55..79bd6a6e4 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -100,7 +100,7 @@ sub config_cups {
 		},
 		disabled => sub {
 		    (!$printer->{cupsconfig}{localprintersshared});
-		}},
+		} },
 	      { text => N("Automatically find available printers on remote machines"), type => 'bool',
 		val => \$printer->{cupsconfig}{remotebroadcastsaccepted} },
 	      if_($::expert,
@@ -145,7 +145,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 			     clicked_may_quit => sub {
 				 $buttonclicked = "add";
 				 1; 
-			     }},
+			     } },
 			   { val => N("Edit selected host/network"), 
 			     type => 'button',
 			     clicked_may_quit => sub {
@@ -154,7 +154,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 			     },
 			     disabled => sub {
 				 return ($#{$sharehosts->{list}} < 0);
-			     }},
+			     } },
 			   { val => N("Remove selected host/network"), 
 			     type => 'button',
 			     clicked_may_quit => sub {
@@ -163,18 +163,18 @@ If some of these measures lead to problems for you, turn this option off, but th
 			     },
 			     disabled => sub {
 				 return ($#{$sharehosts->{list}} < 0);
-			     }},
+			     } },
 			   { val => N("Done"), 
 			     type => 'button',
 			     clicked_may_quit => sub {
 				 $buttonclicked = "";
 				 $subdone = 1;
 				 1; 
-			     }},
+			     } },
 			   ]
 			 );
-		    if (($buttonclicked eq "add") ||
-			($buttonclicked eq "edit")) {
+		    if ($buttonclicked eq "add" ||
+			$buttonclicked eq "edit") {
 			my ($hostchoice, $ip);
 			if ($buttonclicked eq "add") {
 			    # Use first entry as default for a new entry
@@ -193,7 +193,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 			my @menu = (N("Local network(s)"));
 			my @interfaces = 
 			    printer::detect::getNetworkInterfaces();
-		        for my $interface (@interfaces) {
+		        foreach my $interface (@interfaces) {
 			    push (@menu,
 				  (N("Interface \"%s\"", $interface)));
 			}
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 29f4e6065..ebcdf4ce7 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -101,7 +101,7 @@ You can install it by typing \"urpmi xawtv\" as root, in a console.")));
 
 	   if ($in->ask_from("TVdrake", N("Please,\ntype in your tv norm and country"),
                           [
-					  { label => N("TV norm:"), val => \$norm, list => [ "NTSC", "NTSC-JP","PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM" ], type => 'combo' },
+                           { label => N("TV norm:"), val => \$norm, list => [ "NTSC", "NTSC-JP", "PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM" ], type => 'combo' },
 					  { label => N("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1 },
 					  ]
 					 ))
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 5b1ad7889..12789fef1 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -30,7 +30,7 @@ if (!$mouse || !$::auto) {
 	#- and adding the nice test mouse to it
 	Gtk2->timeout_add(100, sub {
 			     defined $::Plug && defined $::Plug->child or return 1;
-			     mouse::test_mouse_standalone($mouse,$::Plug->child);
+			     mouse::test_mouse_standalone($mouse, $::Plug->child);
 			     0;
 			 });
     }