- replace ... =~ 'foo' with ... =~ /foo/

- remove unneeded parentheses for things like ... if (...)

4 files changed, 15 insertions, 16 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 8f1763151..b5eea7742 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -142,13 +142,13 @@ usepeerdns
 defaultroute
 user "$adsl->{login}"
 ));
-	modules::add_alias($_->[0], $_->[1]) foreach (['char-major-108', 'ppp_generic'],
+	modules::add_alias($_->[0], $_->[1]) foreach  ['char-major-108', 'ppp_generic'],
 						      ['tty-ldisc-3', 'ppp_async'],
 						      ['tty-ldisc-13', 'n_hdlc'],
 						      ['tty-ldisc-14', 'ppp_synctty'],
 						      ['ppp-compress-21', 'bsd_comp'],
 						      ['ppp-compress-24', 'ppp_deflate'],
-						      ['ppp-compress-26', 'ppp_deflate']);
+						      ['ppp-compress-26', 'ppp_deflate'];
 	$::isStandalone and modules::write_conf($prefix);
 	$in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->install('speedtouch_mgmt');
 	-e "$prefix/usr/share/speedtouch/mgmt.o" or $in->ask_warn('', N("You need the alcatel microcode.
@@ -178,9 +178,9 @@ usepeerdns
 noauth
 lcp-echo-interval 0
 ));
-    modules::add_alias($_->[0], $_->[1]) foreach (['char-major-108', 'ppp_generic'],
+    modules::add_alias($_->[0], $_->[1]) foreach  ['char-major-108', 'ppp_generic'],
 						  ['tty-ldisc-14', 'ppp_synctty'],
-						  ['tty-ldisc-13', 'n_hdlc']);
+						  ['tty-ldisc-13', 'n_hdlc'];
     $::isStandalone and modules::write_conf($prefix);
 }
 
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 9029cc7c0..183e79ac0 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -25,7 +25,7 @@ sub configure {
       intern_pci:
 	$netc->{isdntype}='isdn_internal';
 	$netcnx->{isdn_internal}={};
-	$netcnx->{isdn_internal}{$_} = $netc->{autodetect}{isdn}{$_} foreach ('description', 'vendor', 'id', 'driver', 'card_type', 'type');
+	$netcnx->{isdn_internal}{$_} = $netc->{autodetect}{isdn}{$_} foreach 'description', 'vendor', 'id', 'driver', 'card_type', 'type';
 	isdn_detect($netcnx->{isdn_internal}, $netc) or return;
     } else {
 	$netc->{isdntype}='isdn_external';
@@ -259,7 +259,7 @@ sub isdn_detect_backend {
     my ($isdn) = @_;
     if (my ($c) = (modules::probe_category('network/isdn'))) {
   	$isdn->{$_} = $c->{$_} foreach qw(description vendor id driver options firmware);
-	$isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach ('vendor', 'id');
+	$isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach 'vendor', 'id';
 	$isdn->{card_type} = 'pci';
 	($isdn->{type}) = $isdn->{options} =~ /type=(\d+)/;
 #	$c->{options} !~ /id=HiSax/ && $isdn->{driver} eq "hisax" and $c->{options} .= " id=HiSax";
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a472f0a2c..5cdd9ef57 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -575,8 +575,8 @@ sub load_conf {
 	}
     }
     $system_name && $domain_name and $netc->{HOSTNAME}=join ('.', $system_name, $domain_name);
-    $adsl_pptp->{$_}=$adsl_pppoe->{$_} foreach ('login', 'passwd', 'passwd2');
-    $isdn_external->{$_}=$modem->{$_} foreach ('device', 'connection', 'phone', 'domain', 'dns1', 'dns2', 'login', 'passwd', 'auth');
+    $adsl_pptp->{$_}=$adsl_pppoe->{$_} foreach 'login', 'passwd', 'passwd2';
+    $isdn_external->{$_}=$modem->{$_} foreach 'device', 'connection', 'phone', 'domain', 'dns1', 'dns2', 'login', 'passwd', 'auth';
     $netcnx->{adsl_pptp}=$adsl_pptp;
     $netcnx->{adsl_pppoe}=$adsl_pppoe;
     $netcnx->{modem}=$modem;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index e1db41702..299016681 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -14,7 +14,7 @@ use MDK::Common::System qw(getVarsFromSh);
 sub write_cnx_script {
     my ($netc, $type, $up, $down, $type2) = @_;
     if ($type) {
-	$netc->{internet_cnx}{$type}{$_->[0]}=$_->[1] foreach ([$connect_file, $up], [$disconnect_file, $down]);
+	$netc->{internet_cnx}{$type}{$_->[0]}=$_->[1] foreach [$connect_file, $up], [$disconnect_file, $down];
 	$netc->{internet_cnx}{$type}{type} = $type2;
     } else {
 	foreach ($connect_file, $disconnect_file) {
@@ -128,13 +128,12 @@ sub detect_timezone {
 
 sub type2interface {
     my ($i) = @_;
-    $i=~/$_->[0]/ and return $_->[1] foreach (
-					      [ modem => 'ppp'],
-					      [ isdn_internal => 'ippp'],
-					      [ isdn_external => 'ppp'],
-					      [ adsl => 'ppp'],
-					      [ cable => 'eth'],
-					      [ lan => 'eth']);
+    $i=~/$_->[0]/ and return $_->[1] foreach [ modem => 'ppp'],
+					     [ isdn_internal => 'ippp'],
+					     [ isdn_external => 'ppp'],
+					     [ adsl => 'ppp'],
+					     [ cable => 'eth'],
+					     [ lan => 'eth'];
 }
 
 sub connected { gethostbyname("mandrakesoft.com") ? 1 : 0 }