From 459eedd7dc7ef289f379d2fc1dc691a057d1e144 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 18 Nov 2004 13:25:45 +0000
Subject: remove some unneeded ";", add some for normalization (as told by
 perl_checker)

---
 perl-install/Xconfig/screen.pm        |  2 +-
 perl-install/any.pm                   |  8 ++++----
 perl-install/authentication.pm        |  4 ++--
 perl-install/bootloader.pm            |  2 +-
 perl-install/commands.pm              |  2 +-
 perl-install/common.pm                | 10 +++++-----
 perl-install/crypto.pm                |  2 +-
 perl-install/detect_devices.pm        | 12 ++++++------
 perl-install/devices.pm               |  4 ++--
 perl-install/diskdrake/resize_ntfs.pm |  2 +-
 perl-install/fs.pm                    |  6 +++---
 perl-install/fsedit.pm                |  2 +-
 perl-install/harddrake/data.pm        |  6 +++---
 perl-install/harddrake/sound.pm       |  4 ++--
 perl-install/install_any.pm           | 12 ++++++------
 perl-install/install_gtk.pm           |  2 +-
 perl-install/install_interactive.pm   |  4 ++--
 perl-install/install_steps.pm         |  8 ++++----
 perl-install/interactive.pm           |  2 +-
 perl-install/interactive/gtk.pm       |  2 +-
 perl-install/interactive/newt.pm      |  2 +-
 perl-install/interactive/stdio.pm     |  2 +-
 perl-install/lang.pm                  |  2 +-
 perl-install/lvm.pm                   |  2 +-
 perl-install/modules.pm               |  4 ++--
 perl-install/mouse.pm                 |  6 +++---
 perl-install/network/adsl.pm          |  2 +-
 perl-install/network/ethernet.pm      |  4 ++--
 perl-install/network/isdn.pm          |  2 +-
 perl-install/network/netconnect.pm    | 30 ++++++++++++++---------------
 perl-install/network/shorewall.pm     |  8 ++++----
 perl-install/partition_table.pm       |  2 +-
 perl-install/raid.pm                  |  2 +-
 perl-install/services.pm              |  2 +-
 perl-install/ugtk2.pm                 | 36 +++++++++++++++++------------------
 perl-install/wizards.pm               | 10 +++++-----
 36 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/perl-install/Xconfig/screen.pm b/perl-install/Xconfig/screen.pm
index 89e416a4d..e0a3ebd64 100644
--- a/perl-install/Xconfig/screen.pm
+++ b/perl-install/Xconfig/screen.pm
@@ -19,7 +19,7 @@ sub configure {
 
     my @sections = mapn {
 	my ($device, $monitor) = @_;
-	{ Device => $device->{Identifier}, Monitor => $monitor->{Identifier} }
+	{ Device => $device->{Identifier}, Monitor => $monitor->{Identifier} };
     } \@devices, \@monitors;
 
     $raw_X->set_screens(@sections);
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 771aac480..268a47519 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -84,7 +84,7 @@ sub install_acpi_pkgs {
 
     my $acpi = bootloader::get_append_with_key($b, 'acpi') or return;
     if (!member($acpi, 'off', 'ht')) {
-	$do_pkgs->install('acpi', 'acpid') if !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid")
+	$do_pkgs->install('acpi', 'acpid') if !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid");
     }
 }
 
@@ -555,7 +555,7 @@ sub inspect {
     my $h = before_leaving {
 	if (!$part->{isMounted} && $dir) {
 	    fs::umount($dir);
-	    unlink($dir)
+	    unlink($dir);
 	}
     };
     $h->{dir} = $dir;
@@ -617,7 +617,7 @@ sub ask_user_one {
 	    ),
 	    if_($security > 3,
                 map {
-                    { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool' }
+                    { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool' };
                 } keys %high_security_groups,
                ),
                ],
@@ -727,7 +727,7 @@ when your installation is complete and you restart your system.")),
 		  { val => \$langs->{$_->[0]}, type => 'bool', disabled => sub { $langs->{all} },
 		    text => $_->[1], advanced => 1,
 		    image => "langs/lang-$_->[0]",
-		  } 
+		  }; 
 	      } sort { $a->[1] cmp $b->[1] } map { [ $_, $sort_func->($_) ] } lang::list_langs())
 	]) or return;
 	$langs->{$listval2val->($lang)} = 1;
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 2d0415a38..dfe1ed6d9 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -25,7 +25,7 @@ sub kind2name {
 sub kind2description() {
     join('', 
          map {
-             qq($_->[0]\n$_->[1]\n\n)
+             qq($_->[0]\n$_->[1]\n\n);
          }
          (
           [ N("Local file:"), N("Use local for all authentication and information user tell in local file"), ],
@@ -187,7 +187,7 @@ sub set {
 
 	if ($ssl eq 'on') {
 		$port = '636';
-	};
+	}
 	
 	
 	
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0b275e6ba..310c00041 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1018,7 +1018,7 @@ sub write_lilo {
 	      } @$fstab;
 	    $hds{$part->{device}} . ":" . $file;
 	} else {
-	    $file
+	    $file;
 	}
     };
 
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 1369d5373..fe6ad8dba 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -328,7 +328,7 @@ sub more {
 	    $v =~ /^q/ and exit 0;
 	    $n = 0;
 	}
-	print
+	print;
     }
 }
 
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 015d266bf..f635cd9f2 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -30,7 +30,7 @@ our $SECTORSIZE  = 512;
 sub sprintf_fixutf8 {
     my $need_upgrade;
     $need_upgrade |= to_bool(c::is_tagged_utf8($_)) + 1 foreach @_;
-    if ($need_upgrade == 3) { c::upgrade_utf8($_) foreach @_ };
+    if ($need_upgrade == 3) { c::upgrade_utf8($_) foreach @_ }
     sprintf shift, @_;
 }
 
@@ -156,12 +156,12 @@ sub expand_symlinks_but_simple {
 	# put back the last simple symlink
 	$f2 =~ s|\Q$link\E$|basename($f)|e;
     }
-    $f2
+    $f2;
 }
 
 sub sync { &MDK::Common::System::sync }
 
-BEGIN { undef *formatError };
+BEGIN { undef *formatError }
 sub formatError {
     my ($err) = @_;
     ref($err) eq 'SCALAR' and $err = $$err;
@@ -174,7 +174,7 @@ sub group_n_lm {
     my $n = shift;
     my @l;
     push @l, [ splice(@_, 0, $n) ] while @_;
-    @l
+    @l;
 }
 
 sub screenshot_dir__and_move() {
@@ -259,7 +259,7 @@ sub set_permissions {
 }
 
 sub mandrake_release() {
-    chomp_(cat_("/etc/mandrakelinux-release"))
+    chomp_(cat_("/etc/mandrakelinux-release"));
 }
 
 sub require_root_capability() {
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 3e9b5b715..670661429 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -180,7 +180,7 @@ sub get {
     my ($mirror, $dir, @files) = @_;
     foreach (@files) {
 	log::l("crypto: downloading $_");
-	ftp($mirror)->get($_, "$dir/$_") 
+	ftp($mirror)->get($_, "$dir/$_"); 
     }
     int @files;
 }
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e1f585a0d..bbc2186f0 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -55,7 +55,7 @@ sub floppies() {
     eval { modules::load("floppy") } if $::isInstall;
     my @fds = $@ ? () : map {
 	my $info = (!dev_is_devfs() || -e "/dev/fd$_") && c::floppy_info(devices::make("fd$_"));
-	if_($info && $info ne '(null)', { device => "fd$_", devfs_device => "floppy/$_", media_type => 'fd', info => $info })
+	if_($info && $info ne '(null)', { device => "fd$_", devfs_device => "floppy/$_", media_type => 'fd', info => $info });
     } qw(0 1);
 
     my @ide = ls120s() and eval { modules::load("ide-floppy") };
@@ -121,7 +121,7 @@ sub get_usb_storage_info_24 {
 	if (@choices > 1) {
 	    @choices = grep { $_->{info} =~ /^\Q$usbs{$host}{vendor_name}/ } @choices;
 	    @choices or log::l("weird, can't find the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next;
-	    @choices == 1 or log::l("argh, can't determine the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next
+	    @choices == 1 or log::l("argh, can't determine the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next;
 	}
 	add2hash($choices[0], $usbs{$host});
     }
@@ -637,7 +637,7 @@ sub pci_probe() {
 	@l{qw(vendor id subvendor subid pci_bus pci_device pci_function media_type driver description)} = split "\t";
 	$l{$_} = hex $l{$_} foreach qw(vendor id subvendor subid);
 	$l{bus} = 'PCI';
-	\%l
+	\%l;
     } c::pci_probe());
 }
 
@@ -650,7 +650,7 @@ sub usb_probe() {
 	$l{media_type} = join('|', grep { $_ ne '(null)' } split('\|', $l{media_type}));
 	$l{$_} = hex $l{$_} foreach qw(vendor id);
 	$l{bus} = 'USB';
-	\%l
+	\%l;
     } c::usb_probe());
 }
 
@@ -664,7 +664,7 @@ sub firewire_probe() {
             specifier_id => hex($get->("$dir/specifier_id")),
             specifier_version => hex($get->("$dir/version")),
             bus => 'Firewire',
-        }
+        };
     } grep { -f "$dev_dir/$_/specifier_id" } all($dev_dir);
 
     my $e;
@@ -736,7 +736,7 @@ sub stringlist() {
 		$_->{description} eq '(null)' ? sprintf("Vendor=0x%04x Device=0x%04x", $_->{vendor}, $_->{id}) : $_->{description},
 		$_->{media_type} ? sprintf(" [%s]", $_->{media_type}) : '',
 		$_->{subid} && $_->{subid} != 0xffff ? sprintf(" SubVendor=0x%04x SubDevice=0x%04x", $_->{subvendor}, $_->{subid}) : '',
-	       )
+	       );
     } probeall(); 
 }
 
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 54fe0a27f..23e45c43f 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -211,8 +211,8 @@ sub to_devfs {
 sub read_proc_partitions_raw() {
     my (undef, undef, @all) = cat_("/proc/partitions");
     grep {
-	$_->{size} != 1 &&	 # skip main extended partition
-	$_->{size} != 0x3fffffff # skip cdroms (otherwise stops cd-audios)
+	$_->{size} != 1 &&	  # skip main extended partition
+	$_->{size} != 0x3fffffff; # skip cdroms (otherwise stops cd-audios)
     } map { 
 	my %l; 
 	@l{qw(major minor size dev)} = split; 
diff --git a/perl-install/diskdrake/resize_ntfs.pm b/perl-install/diskdrake/resize_ntfs.pm
index 6ffe146f9..aa838ea31 100644
--- a/perl-install/diskdrake/resize_ntfs.pm
+++ b/perl-install/diskdrake/resize_ntfs.pm
@@ -16,7 +16,7 @@ sub min_size {
     my ($o) = @_;
     my $r;
     run_program::run('ntfsresize', '>', \$r, '-f', '-i', $o->{dev}) or die "ntfsresize failed:\n$r\n";
-    $r =~ /minimal size: (\d+) KiB/ && $1 * 2 
+    $r =~ /minimal size: (\d+) KiB/ && $1 * 2; 
 }
 
 sub resize {
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 4771068e1..9bf2261d8 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -245,7 +245,7 @@ sub merge_info_from_fstab {
 sub get_info_from_fstab {
     my ($all_hds) = @_;
     my @l = read_fstab($::prefix, '/etc/fstab', 'keep_default');
-    add2all_hds($all_hds, @l)
+    add2all_hds($all_hds, @l);
 }
 
 sub prepare_write_fstab {
@@ -309,7 +309,7 @@ sub prepare_write_fstab {
 
 	    [ $mntpoint, $_->{comment} . join(' ', $dev, $mntpoint, $fs_type, $options || 'defaults', $freq, $passno) . "\n" ];
 	} else {
-	    ()
+	    ();
 	}
     } grep { $_->{device} && ($_->{mntpoint} || $_->{real_mntpoint}) && $_->{fs_type} && ($_->{isFormatted} || !$_->{notFormatted}) } @$fstab;
 
@@ -617,7 +617,7 @@ sub df {
 
     if (!$part->{isMounted}) {
 	umount($dir);
-	unlink($dir)
+	unlink($dir);
     }
 
     $part->{free} = 2 * $free if defined $free;
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index a57fd64e4..8155684c3 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -170,7 +170,7 @@ sub get_hds {
 		    } else {
 			!$o_in || $o_in->ask_okcancel('', formatError($err));
 		    }
-		}
+		};
 	    };
 	    if (my $err = $@) {
 		if ($handled) {
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 64c21db6b..41eea7798 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -16,7 +16,7 @@ sub unknown() {
 	       && !member($_->{driver}, qw(cpia_usb cyber2000fb forcedeth ibmcam megaraid mod_quickcam nvnet ohci1394 ov511 ov518_decomp scanner ultracam usbvideo usbvision))
 	       && $_->{driver} !~ /^ISDN|Mouse:USB|Removable:zip|class\|Mouse|sata|www.linmodems.org/
 	       && $_->{type} ne 'network'
-	       && $_->{description} !~ /Alcatel|ADSL Modem/
+	       && $_->{description} !~ /Alcatel|ADSL Modem/;
 	   } @devices;
 }
 
@@ -169,8 +169,8 @@ our @tree =
       detector => sub { 
           f(grep {
               $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI'
-                || member($_->{driver}, qw(cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp pwc ultracam usbvideo))
-            } @devices)
+                || member($_->{driver}, qw(cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp pwc ultracam usbvideo));
+            } @devices);
       },
       # managed by hotplug:
       checked_on_boot => 0,
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 9fe403f41..9b675b3d9 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -204,7 +204,7 @@ sub switch {
     foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ }
     my @alternative = @{get_alternative($driver)};
     unless ($driver eq $device->{driver} || member($device->{driver}, @alternative)) {
-	push @alternative, @{get_alternative($device->{driver})}, $device->{driver}
+	push @alternative, @{get_alternative($device->{driver})}, $device->{driver};
     }
     if (@alternative) {
         my $new_driver = $driver;
@@ -331,7 +331,7 @@ The current driver for your \"%s\" sound card is \"%s\" ", $device->{description
                 goto end;
             }
         }
-    }
+    };
 }
 
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 99a64701b..fec69884c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -139,7 +139,7 @@ sub changeIso($) {
 	fs::mount($iso_images{loopdev}, $iso_images{mountpoint}, "iso9660", 'readonly');
 	log::l("using ISO image '$iso_label'");
 	1;
-    }
+    };
 }
 
 sub errorOpeningFile($) {
@@ -213,7 +213,7 @@ sub getFile {
 	    $o_altroot ||= '/tmp/image';
 	    $f2 = "$o_altroot/$rel" if $rel !~ m,^/, && (!$postinstall_rpms || !-e $f2);
 	    #- $f2 = "/$rel" if !$::o->{packages}{mediums}{$asked_medium}{rpmsdir} && !-e $f2; #- not a relative path, should not be necessary with new media layout
-	    my $F; open($F, $f2) ? $F : do { $f2 !~ /XXX/ and log::l("Can't open $f2: $!"); undef }
+	    my $F; open($F, $f2) ? $F : do { $f2 !~ /XXX/ and log::l("Can't open $f2: $!"); undef };
 	}
     } || errorOpeningFile($f);
 }
@@ -276,7 +276,7 @@ sub clean_postinstall_rpms() {
 #-######################################################################################
 sub getNextStep {
     my ($o) = @_;
-    find { !$o->{steps}{$_}{done} && $o->{steps}{$_}{reachable} } @{$o->{orderedSteps}}
+    find { !$o->{steps}{$_}{done} && $o->{steps}{$_}{reachable} } @{$o->{orderedSteps}};
 }
 
 sub spawnShell() {
@@ -967,7 +967,7 @@ sub kdemove_desktop_file {
     #- move appropriate file there after an upgrade.
     foreach my $dir (grep { -d $_ } list_skels($prefix, 'Desktop')) {
 	renamef("$dir/$_", "$dir/Trash/$_") 
-	  foreach grep { -e "$dir/$_" } @toMove, grep { /\.rpmorig$/ } all($dir)
+	  foreach grep { -e "$dir/$_" } @toMove, grep { /\.rpmorig$/ } all($dir);
     }
 }
 
@@ -1089,7 +1089,7 @@ sub getAndSaveAutoInstallFloppies {
 
 		substInFile { 
 		    s/timeout.*/$replay ? 'timeout 1' : ''/e;
-		    s/^(\s*append)/$1 $param/ 
+		    s/^(\s*append)/$1 $param/; 
 		} "$mountdir/syslinux.cfg";
 
 		output "$mountdir/boot.msg", $replay ? '' : "\n0c" .
@@ -1312,7 +1312,7 @@ sub migrate_device_names {
 	} else {
 	    #- hopefully this doesn't need anything special
 	}
-    };
+    }
     my @from_fstab_per_hds = values %h or return;
 
 
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 3187a6ac0..0cf8e9a31 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -133,7 +133,7 @@ sub create_help_window {
 	$w->{rwindow}->set_uposition($::rootwidth - $::helpwidth, $::rootheight - $::helpheight);
 	$w->{rwindow}->set_size_request($::helpwidth, $::helpheight);
 	$w->{rwindow}->set_title('skip');
-    };
+    }
     gtkadd($w->{window}, create_scrolled_window($o->{help_window_text} = Gtk2::TextView->new));
     $w->show;
 }
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 971acd2d6..43ec810e5 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -92,7 +92,7 @@ sub partitionWizardSolutions {
     my @hds_rw = grep { !$_->{readonly} } @$hds;
     my @hds_can_add = grep { $_->can_raw_add } @hds_rw;
     if (fs::get::hds_free_space(@hds_can_add) > $min_linux) {
-	$solutions{free_space} = [ 20, N("Use free space"), sub { fsedit::auto_allocate($all_hds, $o->{partitions}); 1 } ]
+	$solutions{free_space} = [ 20, N("Use free space"), sub { fsedit::auto_allocate($all_hds, $o->{partitions}); 1 } ];
     } else { 
 	push @wizlog, N("Not enough free space to allocate new partitions") . ": " .
 	  (@hds_can_add ? 
@@ -102,7 +102,7 @@ sub partitionWizardSolutions {
 
     if (my @truefs = grep { isTrueLocalFS($_) } @$fstab) {
 	#- value twice the ext2 partitions
-	$solutions{existing_part} = [ 6 + @truefs + @$fstab, N("Use existing partitions"), sub { $o->ask_mntpoint_s($fstab) } ]
+	$solutions{existing_part} = [ 6 + @truefs + @$fstab, N("Use existing partitions"), sub { $o->ask_mntpoint_s($fstab) } ];
     } else {
 	push @wizlog, N("There is no existing partition to use");
     }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8570f6e51..716a5c66b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -419,7 +419,7 @@ sub pkg_install {
 	log::l("installing packages");
 	$o->installPackages;
     } else {
-	log::l("all packages selected are already installed, nothing to do")
+	log::l("all packages selected are already installed, nothing to do");
     }
 }
 
@@ -494,7 +494,7 @@ Consoles 1,3,4,7 may also contain interesting information";
 
     my $have_devfsd = do {
 	my $p = pkgs::packageByName($o->{packages}, 'devfsd');
-	$p && $p->flag_installed
+	$p && $p->flag_installed;
     };
     require bootloader;
     bootloader::may_append_with_key($o->{bootloader}, devfs => $have_devfsd ? 'mount' : 'nomount');
@@ -522,7 +522,7 @@ Consoles 1,3,4,7 may also contain interesting information";
 
     if ($o->{mouse}{device} =~ /ttyS/) {
 	log::l("disabling gpm for serial mice (doesn't get along nicely with X)");
-	run_program::rooted($o->{prefix}, "chkconfig", "--del", "gpm") 
+	run_program::rooted($o->{prefix}, "chkconfig", "--del", "gpm"); 
     }
 
     #- install urpmi before as rpmdb will be opened, this will cause problem with update-menus.
@@ -563,7 +563,7 @@ EOF
 GridWidth=85
 GridHeight=70
 " if eof && !$found;
-	} $_ 
+	} $_; 
     }
 
     #- move some file after an upgrade that may be seriously annoying.
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 1d658eda3..35a83905a 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -483,7 +483,7 @@ sub interactive_help_has_id {
 sub interactive_help_get_id {
     my ($_o, @l) = @_;
     @l = map { 
-	join("\n\n", map { s/\n/ /mg; $_ } split("\n\n", translate($help::{$_}->())))
+	join("\n\n", map { s/\n/ /mg; $_ } split("\n\n", translate($help::{$_}->())));
     } grep { exists $help::{$_} } @l;
     join("\n\n\n", @l);
 }
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 871541697..2856bc955 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -699,7 +699,7 @@ sub ask_fromW {
 		}
 	    }
 	    !$error;
-	}
+	};
     };
 
     $_->{set}->($_->{e}{saved_default_val} || next) foreach @widgets_always, @widgets_advanced;
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index c9da9c92a..694c6c2c6 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -95,7 +95,7 @@ sub ask_fromW {
 	    my @choices = map {
 		my $s = simplify_string(may_apply($_->{format}, ${$_->{val}}));
 		$s = "$_->{label}: $s" if $_->{label};
-		{ label => $s, clicked_may_quit => $_->{clicked_may_quit} }
+		{ label => $s, clicked_may_quit => $_->{clicked_may_quit} };
 	    } @$l;
 	    #- replace many buttons with a list
 	    my $new_l = [ { val => \$r, type => 'list', list => \@choices, format => sub { $_[0]{label} }, sort => 0 } ];
diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm
index 8fd7a43ef..d9de3325f 100644
--- a/perl-install/interactive/stdio.pm
+++ b/perl-install/interactive/stdio.pm
@@ -19,7 +19,7 @@ sub readln() {
 
 sub check_it {
     my ($i, $n) = @_;
-    $i =~ /^\s*\d+\s*$/ && 1 <= $i && $i <= $n
+    $i =~ /^\s*\d+\s*$/ && 1 <= $i && $i <= $n;
 }
 
 sub good_choice {
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 4ba80e120..0c5de9bdf 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -162,7 +162,7 @@ sub text_direction_rtl() {
 #-PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
 #-PO: or as "default:RTL", depending if your language is written from
 #-PO: left to right, or from right to left; any other string is wrong.
-       	N("default:LTR") eq "default:RTL"
+       	N("default:LTR") eq "default:RTL";
 }
 
 
diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm
index f223e3cfd..4d3950ec6 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -99,7 +99,7 @@ sub get_lvs {
 
 	   { device => $device, 
 	     fs_type => $fs_type || 'ext2',
-	     size => get_lv_size($device) }
+	     size => get_lv_size($device) };
        } @l
       ];
 }
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index bacc9a955..c1d5f0e0d 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -209,7 +209,7 @@ sub loaded_modules() {
 }
 sub remove_loaded_modules {
     my (@l) = @_;
-    difference2([ uniq(@l) ], [ map { my $s = $_; $s =~ s/_/-/g; $s, $_ } loaded_modules() ])
+    difference2([ uniq(@l) ], [ map { my $s = $_; $s =~ s/_/-/g; $s, $_ } loaded_modules() ]);
 }
 
 sub read_already_loaded { 
@@ -249,7 +249,7 @@ sub when_load_category {
             #- ensure keyboard is working, the kernel must do the job the BIOS was doing
             sleep 4;
             load("usbkbd", "keybdev") if detect_devices::usbKeyboards();
-        }
+        };
     } elsif ($category eq 'bus/firewire') {
 	$conf->set_alias('ieee1394-controller', $name);
     } elsif ($category =~ /sound/) {
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 8b6167d86..dd3b78be8 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -168,7 +168,7 @@ sub fullnames() {
 		$type .= "|[" . N("Other") . "]";
 		'';
 	    }
-	} @{$::b->[1]}
+	} @{$::b->[1]};
     } %mice;
 }
 
@@ -239,7 +239,7 @@ sub probe_wacom_devices {
     log::l("found usb wacom $_->{driver} $_->{description} ($_->{type})") foreach @l;
     my @wacom = eval { 
 	modules::load("wacom", "evdev");
-	grep { detect_devices::tryOpen($_) } map_index { "input/event$::i" } @l
+	grep { detect_devices::tryOpen($_) } map_index { "input/event$::i" } @l;
     };
     @wacom or eval { modules::unload("evdev", "wacom") };
     @wacom;
@@ -444,7 +444,7 @@ sub write_conf {
 	my $xfree_conf = Xconfig::xfree->read;
 	set_xfree_conf($mouse, $xfree_conf, $b_keep_auxmouse_unchanged);
 	$xfree_conf->write;
-    }
+    };
 }
 
 sub change_mouse_live {
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 5066f61ad..49850d1fa 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -62,7 +62,7 @@ If you don't know, choose 'use PPPoE'"),
                        },
                       },
              });
-};
+}
 
 sub adsl_probe_info {
     my ($adsl, $netc, $adsl_type, $o_adsl_modem) = @_;
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 0a7a3d19f..4f55c780e 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -98,7 +98,7 @@ sub get_eth_cards {
             $description = $cards[0]{description} if @cards == 1;
         }
         $a and $saved_driver = $a; # handle multiple cards managed by the same driver
-        [ $interface, $saved_driver, if_($description, $description) ]
+        [ $interface, $saved_driver, if_($description, $description) ];
     } @all_cards;
 }
 
@@ -120,7 +120,7 @@ sub update_iftab() {
         my $descriptor = ${{ ether => 'mac', ieee1394 => 'mac_ieee1394' }}{$link_type} or next;
         substInFile {
             s/^$intf\s+.*\n//;
-            $_ .= qq($intf\t$descriptor $mac_address\n) if eof
+            $_ .= qq($intf\t$descriptor $mac_address\n) if eof;
         } "$::prefix/etc/iftab";
     }
 }
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index e91810aba..b1439bbf7 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -186,7 +186,7 @@ sub get_capi_card {
     my ($isdn) = @_;
 
     my $capi_card = find { 
-        hex($isdn->{vendor}) == $_->{vendor} && hex($isdn->{id}) == $_->{id}
+        hex($isdn->{vendor}) == $_->{vendor} && hex($isdn->{id}) == $_->{id};
     } @isdn_capi or return;
 
     #- check if the capi driver is available
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 1cf45a46c..4297d7361 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -56,7 +56,7 @@ sub detect_timezone() {
     foreach (keys %tmz2country) {
 	if ($_ eq $tm_parse{ZONE}) {
 	    unshift @country, $tmz2country{$_};
-	} else { push @country, $tmz2country{$_} };
+	} else { push @country, $tmz2country{$_} }
     }
     \@country;
 }
@@ -328,7 +328,7 @@ sub real_main {
                     name => N("Select the network interface to configure:"),
                     data =>  sub {
                         [ { label => N("Net Device"), type => "list", val => \$isdn_name, allow_empty_list => 1, 
-                            list => [ $my_isdn, N("External ISDN modem"), keys %isdn_cards ] } ]
+                            list => [ $my_isdn, N("External ISDN modem"), keys %isdn_cards ] } ];
                     },
                     post => sub {
                         # !intern_pci:
@@ -443,7 +443,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
                             ],
                     post => sub { 
                         $isdn->{protocol} = $isdn_type; 
-                        return "isdn_db",
+                        return "isdn_db";
                     }
                    },
 
@@ -485,7 +485,7 @@ Take a look at http://www.linmodems.org"),
                             list => [ keys %{$netc->{autodetect}{modem}}, N("Manual choice") ], } ],
                     },
                     post => sub {
-                        $modem ||= $netcnx->{modem} ||= {};;
+                        $modem ||= $netcnx->{modem} ||= {};
                         return 'choose_serial_port' if $modem_name eq N("Manual choice");
                         $ntf_name = $netc->{autodetect}{modem}{$modem_name}{device} || $netc->{autodetect}{modem}{$modem_name}{description};
 
@@ -558,14 +558,14 @@ Take a look at http://www.linmodems.org"),
                                 s/%([0-9]{3})/chr(int($1))/eg;
                                 $countries{$country} ||= translate($country);
                                 join('', $countries{$country}, $_);
-                            } grep { !/.directory$/ } glob_("$p_db_path/$country/*")
+                            } grep { !/.directory$/ } glob_("$p_db_path/$country/*");
                         } map { s!$p_db_path/!!o; s!_! !g; $_ } glob_("$p_db_path/*");
                         $old_provider = $provider;
                     },
                     name => N("Select your provider:"),
                     data => sub {
                         [ { label => N("Provider:"), type => "list", val => \$provider, separator => '/',
-                            list => [ N("Unlisted - edit manually"), @isp ] } ]
+                            list => [ N("Unlisted - edit manually"), @isp ] } ];
                     },
                     post => sub {
                         if ($provider ne N("Unlisted - edit manually")) {
@@ -932,7 +932,7 @@ Do you really want to reconfigure this device?"),
                     name => sub { 
                         my $_msg = N("Zeroconf hostname resolution");
                         N("Configuring network device %s (driver %s)", $ethntf->{DEVICE}, $module) . "\n\n" .
-                          N("The following protocols can be used to configure an ethernet connection. Please choose the one you want to use")
+                          N("The following protocols can be used to configure an ethernet connection. Please choose the one you want to use");
                     },
                     data => sub {
                         [ { val => \$protocol, type => "list", list => [ sort values %l10n_lan_protocols ] } ];
@@ -1010,7 +1010,7 @@ notation (for example, 1.2.3.4).")),
                         }
                     },
                     focus_out => sub {
-                        $ethntf->{NETMASK} ||= netmask($ethntf->{IPADDR}) unless $_[0]
+                        $ethntf->{NETMASK} ||= netmask($ethntf->{IPADDR}) unless $_[0];
                     },
                     post => sub {
                         $ethntf->{ONBOOT} = bool2yesno($onboot);
@@ -1101,7 +1101,7 @@ those interface specific commands and their effect.
 
 See iwpriv(8) man page for further information."),
                              }
-                         ]
+                         ];
                     },
                     post => sub {
                         # untranslate parameters
@@ -1267,14 +1267,14 @@ It is not necessary on most networks."),
                                                ONBOOT => 1, DIAL_ON_IFUP => 0 });
                         my $method =  find {
                             $_->{ONBOOT} eq text2bool($intf->{ippp0}{ONBOOT}) &&
-                              $_->{DIAL_ON_IFUP} eq text2bool($intf->{ippp0}{DIAL_ON_IFUP})
+                              $_->{DIAL_ON_IFUP} eq text2bool($intf->{ippp0}{DIAL_ON_IFUP});
                         } @isdn_dial_methods;
                         #- use net_applet by default
                         $isdn->{dial_method} = $method->{name} || $isdn_dial_methods[1]{name};
                     },
                     name => N("How do you want to dial this connection?"),
                     data => sub {
-                        [ { type => "list", val => \$isdn->{dial_method}, list => [ map { $_->{name} } @isdn_dial_methods ] } ]
+                        [ { type => "list", val => \$isdn->{dial_method}, list => [ map { $_->{name} } @isdn_dial_methods ] } ];
                     },
                     post => sub {
                         my $method = find { $_->{name} eq $isdn->{dial_method} } @isdn_dial_methods;
@@ -1367,7 +1367,7 @@ Click on Ok to keep your configuration, or cancel to reconfigure your Internet &
                     $use_wizard = 0;
                 };
         }
-      };
+      }
       
       if ($use_wizard) {
           require wizards;
@@ -1432,14 +1432,14 @@ sub get_net_device() {
     my $connect_file = $network::tools::connect_file;
     my $network_file = "$::prefix/etc/sysconfig/network";
 		if (cat_("$::prefix$connect_file") =~ /ifup/) {
-  		if_(cat_($connect_file) =~ /^\s*ifup\s+(.*)/m, split(' ', $1))
+		    if_(cat_($connect_file) =~ /^\s*ifup\s+(.*)/m, split(' ', $1));
 		} elsif (cat_("$::prefix$connect_file") =~ /network/) {
 			${{ getVarsFromSh("$::prefix$network_file") }}{GATEWAYDEV};
     } elsif (cat_("$::prefix$connect_file") =~ /isdn/) {
 			"ippp+"; 
     } else {
 			"ppp+";
-    };
+    }
 }
 
 sub read_net_conf {
@@ -1450,7 +1450,7 @@ sub read_net_conf {
     network::network::read_all_conf($::prefix, $netc, $intf, $netcnx);
 
     foreach ('NET_DEVICE', 'NET_INTERFACE') {
-        $netc->{$_} = $netcnx->{$_} if $netcnx->{$_}
+        $netc->{$_} = $netcnx->{$_} if $netcnx->{$_};
     }
     $netcnx->{$netcnx->{type}} ||= {} if $netcnx->{type};
 }
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 94ce0abb1..687c73798 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -105,7 +105,7 @@ sub read {
 	    put_in_hash(\%conf, default_interfaces_silent($in));
     } else {
 	    put_in_hash(\%conf, default_interfaces($in));
-    };
+    }
     $conf{net_interface} && \%conf;
 }
 
@@ -138,14 +138,14 @@ sub write {
     		    if_(cat_("$::prefix$connect_file") =~ /pptp/, [ 'ACCEPT', 'fw', 'loc:10.0.0.138', 'tcp', '1723' ]),
 		    if_(cat_("$::prefix$connect_file") =~ /pptp/, [ 'ACCEPT', 'fw', 'loc:10.0.0.138', 'gre' ]),
 		    (map { 
-			map_each { [ 'ACCEPT', $_, 'fw', $::a, join(',', @$::b), '-' ] } %ports_by_proto 
+			map_each { [ 'ACCEPT', $_, 'fw', $::a, join(',', @$::b), '-' ] } %ports_by_proto; 
 		    } ('net', if_($conf->{loc_interface}[0], 'loc'))),
 		   );
 		   if (cat_("/etc/shorewall/rules") !~ /^\s*REDIRECT\s*loc\s*$squid_port\s+(\S+)/mg && $squid_port && -f "/var/run/squid.pid" && grep { /Loc/i } cat_("/etc/shorewall/zones")) {
 	substInFile {
 		s/#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE/REDIRECT\tloc\t$squid_port\ttcp\twww\t-\nACCEPT\tfw\tnet\ttcp\twww\n#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE/;
-	} "/etc/shorewall/rules"
-};
+	} "/etc/shorewall/rules";
+}
     set_config_file('masq', 
 		    $conf->{masquerade} ? [ $conf->{net_interface}, $conf->{masquerade}{subnet} ] : (),
 		   );
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index c77b06c0b..6af7d26bc 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -207,7 +207,7 @@ sub adjust_local_extended {
 sub get_normal_parts {
     my ($hd) = @_;
 
-    @{$hd->{primary}{normal} || []}, map { $_->{normal} } @{$hd->{extended} || []}
+    @{$hd->{primary}{normal} || []}, map { $_->{normal} } @{$hd->{extended} || []};
 }
 
 sub get_normal_parts_and_holes {
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 1570712db..f8dec7961 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -251,7 +251,7 @@ sub parse_mdadm_conf {
 	    push @{$conf{ARRAY}}, \%md_conf;
 	}
     }
-    \%conf
+    \%conf;
 }
 
 1;
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 1e2a32fc4..696af6643 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -242,7 +242,7 @@ sub ask_standalone_gtk {
 			      $display->($_);
 			  })) if !$is_xinetd_service;
 		  } (N_("Start"), N_("Stop"))
-		]
+		];
 	    }
             @$l), [ $::isEmbedded ? 'automatic' : 'never', 'automatic' ]), -1, $::isEmbedded ? -1 : 400),
             0, gtkpack(gtkset_border_width(Gtk2::HBox->new(0,0),5), $W->create_okcancel)
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 54f99274b..a72aaa945 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -100,7 +100,7 @@ sub gtkadd {
 	ref $l or $l = Gtk2::WrappedLabel->new($l);
 	$w->add(gtkshow($l));
     }
-    $w
+    $w;
 }
 
 sub gtkadd_widget {
@@ -119,14 +119,14 @@ sub gtkappend {
 	ref $l or $l = Gtk2::WrappedLabel->new($l);
 	$w->append(gtkshow($l));
     }
-    $w
+    $w;
 }
 
 sub gtkappenditems {
     my $w = shift;
     $_->show foreach @_;
     $w->append_items(@_);
-    $w
+    $w;
 }
 
 # append page to a notebook
@@ -278,7 +278,7 @@ sub create_scrolled_window {
     my $w = Gtk2::ScrolledWindow->new(undef, undef);
     $w->set_policy($o_policy ? @$o_policy : ('automatic', 'automatic'));
     if (member(ref($W), qw(Gtk2::Layout Gtk2::Text Gtk2::TextView Gtk2::TreeView))) {
-	$w->add($W)
+	$w->add($W);
     } else {
 	$w->add_with_viewport($W);
     }
@@ -287,9 +287,9 @@ sub create_scrolled_window {
     $W->set_left_margin(6) if ref($W) =~ /Gtk2::TextView/;
     $W->show;
     if (ref($W) =~ /Gtk2::TextView|Gtk2::TreeView/) {
-    	gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'in'), $w)
+    	gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'in'), $w);
     } else {
-	$w
+	$w;
     }
 }
 
@@ -358,18 +358,18 @@ sub create_box_with_title {
 					  )
 			      ),
 		      if_($a, Gtk2::HSeparator->new)
-		     )
+		     );
 	} else {
 	    gtkpack__($box,
 		      if_($::isWizard, gtkset_size_request(Gtk2::Label->new, 0, 10)),
 		      (map {
 			  my $w = $new_label->($_);
 			  $::isWizard ? gtkpack__(Gtk2::HBox->new(0,0), gtkset_size_request(Gtk2::Label->new, 20, 0), $w)
-			              : $w
+			              : $w;
 		      } @l),
 		      if_($::isWizard, gtkset_size_request(Gtk2::Label->new, 0, 15)),
 		      if_($a, Gtk2::HSeparator->new)
-		     )
+		     );
 	}
     }
 }
@@ -417,7 +417,7 @@ sub create_dialog {
     $dialog->action_area->pack_start($button, 1, 1, 0);
     $button->grab_default;
 
-    $dialog->set_has_separator(0);;
+    $dialog->set_has_separator(0);
     $dialog->show_all;
     Gtk2->main;
     $ret;
@@ -462,7 +462,7 @@ sub create_menu {
     my $title = shift;
     my $w = Gtk2::MenuItem->new($title);
     $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_)));
-    $w
+    $w;
 }
 
 sub create_notebook {
@@ -471,7 +471,7 @@ sub create_notebook {
 	my ($page, $title) = splice(@_, 0, 2);
 	gtkappend_page($book, $page, $title);
     }
-    $book
+    $book;
 }
 
 sub create_packtable {
@@ -546,7 +546,7 @@ sub create_okcancel {
                                     $_->can_default($::isWizard);
                                     $_;
                                 } grep { $_ } @{$_->[0]})
-                               )
+                               );
                     } ([ \@left, 'start' ],
                        [ \@right,  'end' ],
                       )
@@ -1015,7 +1015,7 @@ sub main {
 	Gtk2->main;
     } while (!$o->{destroyed} && ($o->{retval} ? $o_completed && !$o_completed->() : $o_canceled && !$o_canceled->()));
     $o->destroy;
-    $o->{retval}
+    $o->{retval};
 }
 sub show($) {
     my ($o) = @_;
@@ -1042,7 +1042,7 @@ sub shrink_topwindow {
 sub exit {
     gtkset_mousecursor_normal(); #- for restoring a normal in any case
     flush();
-    c::_exit($_[1]) #- workaround 
+    c::_exit($_[1]); #- workaround 
 }
 
 #- in case "exit" above was not called by the program
@@ -1230,7 +1230,7 @@ sub ask_browse_tree_info {
     @buttons = reverse @buttons if !$::isInstall;    
 
     gtkpack__($box2, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-					   ask_warn(N("Help"), $common->{interactive_help}->())
+					   ask_warn(N("Help"), $common->{interactive_help}->());
 				       })) if $common->{interactive_help};
 
     if ($common->{auto_deps}) {
@@ -1612,7 +1612,7 @@ sub set_popdown_strings {
     #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]);
     $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs;
     $w->set_menu($menu);
-    $w
+    $w;
 }
 
 sub new_with_strings {
@@ -1655,7 +1655,7 @@ sub set_popdown_strings {
     # keep string list around for ->set_text compatibilty helper
     $w->{strings} = \@strs;
     $w->append_text($_) foreach @strs;
-    $w
+    $w;
 }
 
 sub new_with_strings {
diff --git a/perl-install/wizards.pm b/perl-install/wizards.pm
index 2ae0af4ca..cb40c881e 100644
--- a/perl-install/wizards.pm
+++ b/perl-install/wizards.pm
@@ -119,7 +119,7 @@ sub process {
         my ($res, $msg) = &{$o->{init}};
         if (!$res) {
             $in->ask_okcancel(N("Error"), $msg);
-            die "wizard failled" if !$::testing
+            die "wizard failled" if !$::testing;
         }
     }
     
@@ -146,10 +146,10 @@ sub process {
                 my $i;
                 foreach (@{$d->{boolean_list}}) { 
                     push @$data2, { text => $_, type => 'bool', val => \${$d->{val}}->[$i], disabled => $d->{disabled} };
-                    $i++
+                    $i++;
                 }
             } else {
-                push @$data2, $d
+                push @$data2, $d;
             }
         }
         my $name = ref($page->{name}) ? $page->{name}->() : $page->{name};
@@ -185,9 +185,9 @@ sub process {
             die qq(Step "$current": inexistant "$next" page) if !exists $o->{pages}{$next};
         } else {
             # step back:
-            $next = pop @steps
+            $next = pop @steps;
         }
-        $page = $o->{pages}{$next}
+        $page = $o->{pages}{$next};
     }
 }
 
-- 
cgit v1.2.1