From 22ad938758373ec4e2f8490d62f2cdc237d50d7c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 11 Nov 2002 22:20:22 +0000 Subject: - replace ... =~ 'foo' with ... =~ /foo/ - remove unneeded parentheses for things like ... if (...) --- perl-install/Xconfig/card.pm | 2 +- perl-install/bootlook.pm | 10 +++++----- perl-install/common.pm | 2 +- perl-install/detect_devices.pm | 2 +- perl-install/diskdrake/dav.pm | 2 +- perl-install/fs.pm | 4 ++-- perl-install/harddrake/data.pm | 20 ++++++++++---------- perl-install/harddrake/ui.pm | 4 ++-- perl-install/http.pm | 2 +- perl-install/install_any.pm | 9 ++++----- perl-install/install_steps.pm | 4 ++-- perl-install/install_steps_interactive.pm | 2 +- perl-install/interactive/newt.pm | 2 +- perl-install/interactive/stdio.pm | 4 ++-- perl-install/my_gtk.pm | 4 ++-- perl-install/network/adsl.pm | 8 ++++---- perl-install/network/isdn.pm | 4 ++-- perl-install/network/netconnect.pm | 4 ++-- perl-install/network/tools.pm | 15 +++++++-------- perl-install/pkgs.pm | 2 +- perl-install/printer.pm | 2 +- perl-install/printerdrake.pm | 3 +-- perl-install/security/main.pm | 2 +- perl-install/security/msec.pm | 4 ++-- 24 files changed, 57 insertions(+), 60 deletions(-) diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 3d2f472eb..870ba3f22 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -521,7 +521,7 @@ sub check_bad_card { $bad_card ||= $card->{Driver} eq 'i810' || $card->{Driver} eq 'fbdev'; $bad_card ||= $card->{Driver} eq 's3virge' if $::live; $bad_card ||= $card->{Driver} eq 'nvidia' if !$::isStandalone; #- avoid testing during install at any price. - $bad_card ||= $card->{server} =~ 'FBDev|Sun' if !using_xf4($card); + $bad_card ||= $card->{server} =~ /FBDev|Sun/ if !using_xf4($card); log::l("the graphics card does not like X in framebuffer") if $bad_card; diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm index 04c752ee7..45995a69f 100644 --- a/perl-install/bootlook.pm +++ b/perl-install/bootlook.pm @@ -84,10 +84,10 @@ my $menubar = ugtk::create_factory_menu($window, @menu_items); my $user_combo = new Gtk::Combo; $user_combo->set_popdown_strings(@usernames); -$user_combo->entry->set_text($auto_mode{autologin}) if ($auto_mode{autologin}); +$user_combo->entry->set_text($auto_mode{autologin}) if $auto_mode{autologin}; my $desktop_combo =new Gtk::Combo; $desktop_combo->set_popdown_strings(get_wm()); -$desktop_combo->entry->set_text($auto_mode{desktop}) if ($auto_mode{desktop}); +$desktop_combo->entry->set_text($auto_mode{desktop}) if $auto_mode{desktop}; my $a_c_button = new Gtk::RadioButton (N("NewStyle Categorizing Monitor")); my $a_h_button = new Gtk::RadioButton N("NewStyle Monitor"), $a_c_button; my $a_v_button = new Gtk::RadioButton N("Traditional Monitor"), $a_c_button; @@ -136,7 +136,7 @@ foreach (keys (%combo)) { $combo{'thms'}->set_popdown_strings(@thms); $combo{'lilo'}->set_popdown_strings(@lilo_thms); -$combo{'boot'}->set_popdown_strings(@boot_thms) if(! $no_bootsplash); +$combo{'boot'}->set_popdown_strings(@boot_thms) if !$no_bootsplash; my $lilo_pixbuf; my $lilo_pic = gtkpng($themes{'def_thmb'}); @@ -377,7 +377,7 @@ sub parse_etc_passwd { @user_info = getpwent(); ($uname, $uid) = @user_info[0,2]; push (@usernames, $uname) if ($uid > 500) and !($uname eq "nobody"); - } while (@user_info); + } while @user_info; } sub get_wm { @@ -477,7 +477,7 @@ sub updateAutologin { $in->do_pkgs->install('autologin') if $x_mode; set_autologin('',$usern,$deskt); } else { - set_autologin('',undef) if ($x_no_button->get_active()); + set_autologin('',undef) if $x_no_button->get_active(); } } diff --git a/perl-install/common.pm b/perl-install/common.pm index 6dd6f279c..3e46d89aa 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -139,7 +139,7 @@ sub sync { &MDK::Common::System::sync } sub group_n_lm { my $n = shift; my @l; - push @l, [ splice(@_, 0, $n) ] while (@_); + push @l, [ splice(@_, 0, $n) ] while @_; @l } diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 2abe7621d..9397655ce 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -616,7 +616,7 @@ sub whatUsbport() { next if !$realport; next if ! -r $realport; local *PORT; - open PORT, $realport or do next; + open PORT, $realport or next; my $idstr = ""; # Calculation of IOCTL function 0x84005001 (to get device ID # string): diff --git a/perl-install/diskdrake/dav.pm b/perl-install/diskdrake/dav.pm index 73f51ee4c..4b19cf246 100644 --- a/perl-install/diskdrake/dav.pm +++ b/perl-install/diskdrake/dav.pm @@ -27,7 +27,7 @@ points, select \"New\".")) }, { val => N("New"), clicked_may_quit => sub { create($in, $all_hds); 1 } }, { val => N("Quit"), icon => "exit", clicked_may_quit => sub { $quit = 1 } }, ]); - } until ($quit); + } until $quit; diskdrake::interactive::Done($in, $all_hds); } diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 67a56c609..0c07e5d9a 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -338,7 +338,7 @@ sub mount_options_unpack { my @unknown; foreach (split(",", $packed_options)) { if ($_ eq 'user') { - $options{$_} = 1 foreach ('user', @$user_implies); + $options{$_} = 1 foreach 'user', @$user_implies; } elsif (exists $non_defaults->{$_}) { $options{$_} = 1; } elsif ($defaults->{$_}) { @@ -401,7 +401,7 @@ sub mount_options_help { if ($v == 1) { $s = $short{$s} || $s; $option = exists $help{$s} && !$help{$s} ? $s : ''; - } elsif ($v !~ 'E0') { + } elsif ($v !~ /E0/) { s/\\//g; s/\s*"(.*?)"\s*/$1/g if s/^\.BR\s+//; s/^\.B\s+//; diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index e4c2b8062..e6dc7ccce 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -27,11 +27,11 @@ our @tree = ["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 ], + ["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 ], ["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, @@ -42,7 +42,7 @@ our @tree = 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 ], + ["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 { @@ -56,10 +56,10 @@ our @tree = &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/ui.pm b/perl-install/harddrake/ui.pm index c4009e5e9..bc4706c16 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm @@ -117,7 +117,7 @@ sub detect { my @class_tree; foreach (@harddrake::data::tree) { my ($Ident, $title, $icon, $configurator, $detector) = @$_; - next if (ref($detector) ne "CODE"); #skip class witouth detector + next if ref($detector) ne "CODE"; #skip class witouth detector next if $Ident =~ /(MODEM|PRINTER)/ && "@ARGV" =~ /test/; next if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION}; next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION}; @@ -125,7 +125,7 @@ sub detect { # standalone::explanations("Probing %s class\n", $Ident); my @devices = &$detector; - next if (!listlength(@devices)); # Skip empty class (no devices) + next if !listlength(@devices); # Skip empty class (no devices) my $devices_list; foreach (@devices) { $_->{custom_id} = harddrake::data::custom_id($_, $title); diff --git a/perl-install/http.pm b/perl-install/http.pm index 8d1e8d5de..ad05b761e 100644 --- a/perl-install/http.pm +++ b/perl-install/http.pm @@ -34,7 +34,7 @@ sub getFile { $last = $now; &$read; &$read if $buf =~ /\015/; $now = $buf =~ /\012/; - } until ($now && $last); + } until $now && $last; $tmp =~ /^.*\b200\b/ ? $sock : undef; } diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index f3a896d23..a0431067b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -60,7 +60,7 @@ sub askChangeMedium($$) { my $allow; do { eval { $allow = changeMedium($method, $medium) }; - } while ($@); #- really it is not allowed to die in changeMedium!!! or install will cores with rpmlib!!! + } while $@; #- really it is not allowed to die in changeMedium!!! or install will cores with rpmlib!!! log::l($allow ? "accepting medium $medium" : "refusing medium $medium"); $allow; } @@ -1180,10 +1180,9 @@ sub remove_bigseldom_used { unlink "/usr/X11R6/lib/modules/xf86Wacom.so"; unlink glob_("/usr/share/gtk/themes/$_*") foreach qw(marble3d); unlink(m|^/| ? $_ : "/usr/bin/$_") foreach - ((map { @$_ } @bigseldom_used_groups), - qw(pvcreate pvdisplay vgchange vgcreate vgdisplay vgextend vgremove vgscan lvcreate lvdisplay lvremove /lib/liblvm.so), - qw(mkreiserfs resize_reiserfs mkfs.xfs fsck.jfs), - ); + (map { @$_ } @bigseldom_used_groups), + qw(pvcreate pvdisplay vgchange vgcreate vgdisplay vgextend vgremove vgscan lvcreate lvdisplay lvremove /lib/liblvm.so), + qw(mkreiserfs resize_reiserfs mkfs.xfs fsck.jfs); } ################################################################################ diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index e62de662d..c4f92b8bc 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -171,8 +171,8 @@ sub doPartitionDisksAfter { if ($o->{partitioning}{use_existing_root}) { #- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat - fs::mount_part($_, $o->{prefix}) foreach (sort { $a->{mntpoint} cmp $b->{mntpoint} } - grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}}); + fs::mount_part($_, $o->{prefix}) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} } + grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}}; } cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/image nfs| && diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index af4daabf1..e18fccb2c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1047,7 +1047,7 @@ sub summary { harddrake::v4l::config($o, $driver); } } - } grep { $_->{driver} =~ '(bttv|saa7134)' } detect_devices::probeall()), + } grep { $_->{driver} =~ /(bttv|saa7134)/ } detect_devices::probeall()), ]); install_steps::configureTimezone($o); #- do not forget it. } diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm index 836fc0030..1f1a49d0d 100644 --- a/perl-install/interactive/newt.pm +++ b/perl-install/interactive/newt.pm @@ -233,7 +233,7 @@ sub ask_fromW_real { Newt::PopWindow(); return $v || &ask_fromW; } - } until ($check->($common->{callbacks}{$canceled ? 'canceled' : 'complete'})); + } until $check->($common->{callbacks}{$canceled ? 'canceled' : 'complete'}); $form->FormDestroy; Newt::PopWindow(); diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm index 737b966f7..1952cc0e5 100644 --- a/perl-install/interactive/stdio.pm +++ b/perl-install/interactive/stdio.pm @@ -29,7 +29,7 @@ sub good_choice { defined $i and print N("Bad choice, try again\n"); print N("Your choice? (default %s) ", $def_s); $i = readln(); - } until (!$i || check_it($i, $max)); + } until !$i || check_it($i, $max); $i; } @@ -149,7 +149,7 @@ Your choice? "); defined $i and print N("Bad choice, try again\n"); print N("Your choice? (default %s) ", $common->{focus_cancel} ? $common->{cancel} : $common->{ok}); $i = readln() || ($common->{focus_cancel} ? "2" : "1"); - } until (check_it($i, 9)); + } until check_it($i, 9); $i == 9 and goto ask_fromW_begin; } else { $i = 1; diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 89cacba8c..66b57ddfa 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -264,8 +264,8 @@ sub _create_window($$) { my $s = "\xFF" x ($wia*$he); my $wib = $wia*8; my $dif = $wib-$wi; - foreach my $y (0..$sqw-1) { vec($s, $wib-1-$dif-$_+$wib*$y, 1) = 0x0 foreach (0..$sqw-1) } - foreach my $y (0..$sqw-1) { vec($s, (($he-1)*$wib)-$wib*$y+$_, 1) = 0x0 foreach (0..$sqw-1) } + foreach my $y (0..$sqw-1) { vec($s, $wib-1-$dif-$_+$wib*$y, 1) = 0x0 foreach 0..$sqw-1 } + foreach my $y (0..$sqw-1) { vec($s, (($he-1)*$wib)-$wib*$y+$_, 1) = 0x0 foreach 0..$sqw-1 } $w->realize; my $b = Gtk::Gdk::Bitmap->create_from_data($w->window, $s, $wib, $he); $w->window->shape_combine_mask($b, 0, 0); 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 } diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 1f55bed41..f71ceebbc 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -1094,7 +1094,7 @@ sub install($$$;$$) { } } cleanHeaders($prefix); - } while ($nb > 0 && !$pkgs::cancel_install); + } while $nb > 0 && !$pkgs::cancel_install; closeInstallLog(); diff --git a/perl-install/printer.pm b/perl-install/printer.pm index df989355b..11f451442 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -629,7 +629,7 @@ sub add_spooler_to_security_level { sub files_exist { my @files = @_; foreach my $file (@files) { - return 0 if (! -f "$prefix$file"), + return 0 if ! -f "$prefix$file"; } return 1; } diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 7c6d411b6..06f1119b9 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -2226,8 +2226,7 @@ Note: the photo test page can take a rather long time to get printed and on lase { text => N("Do not print any test page"), type => 'bool', val => \$res2 } : ()) ]); - $res2 = 1 if (!($standard || $altletter || $alta4 || $photo || - $ascii)); + $res2 = 1 if !($standard || $altletter || $alta4 || $photo || $ascii); if ($res1 && !$res2) { my @lpq_output; { diff --git a/perl-install/security/main.pm b/perl-install/security/main.pm index 40dae3daf..ba15e01c2 100644 --- a/perl-install/security/main.pm +++ b/perl-install/security/main.pm @@ -57,7 +57,7 @@ sub basic_seclevel_option { my @sec_levels = $msec->get_seclevel_list(); my $current_level = $msec->get_secure_level(); - push(@sec_levels, $current_level) if ($current_level eq "Dangerous" || $current_level eq "Poor"); + push(@sec_levels, $current_level) if $current_level eq "Dangerous" || $current_level eq "Poor"; $$seclevel_entry->entry->set_editable(0); $$seclevel_entry->set_popdown_strings(@sec_levels); diff --git a/perl-install/security/msec.pm b/perl-install/security/msec.pm index 94af85fa3..33d7fd76d 100644 --- a/perl-install/security/msec.pm +++ b/perl-install/security/msec.pm @@ -195,7 +195,7 @@ sub get_functions { (undef, $function) = split(/ /, $_); ($function, undef) = split(/\(/, $function); if (!(member($function, @ignore_list))) { - push(@functions, $function) if (member($function, @{$options{$category}})); + push(@functions, $function) if member($function, @{$options{$category}}); } } } @@ -250,7 +250,7 @@ sub get_default_checks { open F, $check_file; while () { ($check, undef) = split(/=/, $_); - push @checks, $check if (!(member($check, qw(MAIL_USER)))) + push @checks, $check if !(member($check, qw(MAIL_USER))) } close F; } -- cgit v1.2.1