summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/bootlook.pm8
-rw-r--r--perl-install/harddrake/ui.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/lang.pm2
-rw-r--r--perl-install/network/adsl.pm2
-rw-r--r--perl-install/network/ethernet.pm2
-rw-r--r--perl-install/network/isdn.pm2
-rw-r--r--perl-install/network/netconnect.pm12
-rw-r--r--perl-install/network/network.pm4
-rw-r--r--perl-install/network/tools.pm6
-rw-r--r--perl-install/printer/common.pm6
-rw-r--r--perl-install/printer/cups.pm2
-rw-r--r--perl-install/printer/detect.pm6
-rw-r--r--perl-install/printer/gimp.pm18
-rw-r--r--perl-install/printer/main.pm16
-rw-r--r--perl-install/printer/printerdrake.pm74
-rw-r--r--perl-install/resize_fat/fat.pm6
-rw-r--r--perl-install/resize_fat/io.pm2
-rw-r--r--perl-install/services.pm2
-rw-r--r--perl-install/ugtk.pm2
22 files changed, 90 insertions, 90 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 6468069e3..d567beb23 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -611,7 +611,7 @@ END
}
sub miscellaneousNetwork {
- setExportedVarsInSh ("$::prefix/etc/profile.d/proxy.sh", $::o->{miscellaneous}, qw(http_proxy ftp_proxy));
+ setExportedVarsInSh( "$::prefix/etc/profile.d/proxy.sh", $::o->{miscellaneous}, qw(http_proxy ftp_proxy));
setExportedVarsInCsh("$::prefix/etc/profile.d/proxy.csh", $::o->{miscellaneous}, qw(http_proxy ftp_proxy));
}
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index ab962b3a7..3094be84c 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -324,7 +324,7 @@ Click on Configure to launch the setup wizard.", $lilogrub),
$x_box->set_sensitive(!$x_mode);
$x_mode = !$x_mode;
}),
- gtkpack__(gtkset_sensitive ($x_box, $x_mode),
+ gtkpack__(gtkset_sensitive($x_box, $x_mode),
gtkset_active(my $x_no_button = new Gtk::RadioButton(N("No, I don't want autologin")), !$l_mode),
gtkpack__(new Gtk::HBox(0, 10),
gtkset_active(my $x_yes_button = new Gtk::RadioButton((N("Yes, I want autologin with this (user, desktop)")), $x_no_button), $l_mode),
@@ -336,7 +336,7 @@ Click on Configure to launch the setup wizard.", $lilogrub),
)
)
),
- gtkadd (gtkset_layout(new Gtk::HButtonBox, 'end'),
+ gtkadd(gtkset_layout(new Gtk::HButtonBox, 'end'),
gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub { updateInit(); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk->exit(0) }),
gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) })
)
@@ -373,12 +373,12 @@ sub parse_etc_passwd {
do {
@user_info = getpwent();
($uname, $uid) = @user_info[0,2];
- push (@usernames, $uname) if $uid > 500 and !($uname eq "nobody");
+ push @usernames, $uname if $uid > 500 and !($uname eq "nobody");
} while @user_info;
}
sub get_wm {
- @winm = (split (' ', `/usr/sbin/chksession -l`));
+ @winm = split(' ', `/usr/sbin/chksession -l`);
}
#-------------------------------------------------------------
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index a0b503734..fb1e70a76 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -99,7 +99,7 @@ my @menu_items =
{ path => N("/_Help").N("/_About..."),
callback => sub {
$in->ask_warn(N("About Harddrake"),
- join ("", N("This is HardDrake, a Mandrake hardware configuration tool.\nVersion:"), " $harddrake::data::version\n",
+ join("", N("This is HardDrake, a Mandrake hardware configuration tool.\nVersion:"), " $harddrake::data::version\n",
N("Author:"), " Thierry Vignaud <tvignaud\@mandrakesoft.com> \n\n",
formatAlaTeX($::license)));
}
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index d5a16e173..0837ab0a6 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -505,7 +505,7 @@ sub installPackages {
foreach (@data) {
my ($text, $x, $y, $area_width, $area_height, $bold) = @$_;
my ($width, $height, $lines, $widths, $heights, $ascents, $descents) =
- get_text_coord ($text, $darea, $area_width, $area_height, 1, 0, 1, 1);
+ get_text_coord($text, $darea, $area_width, $area_height, 1, 0, 1, 1);
if ($first && $icon) {
my $iconx = ($dx-$width)/2 + $x + ${$widths}[0] - $icon_dx;
my $icony = $y + ${$heights}[0] - $icon_dy/2;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 0514093ff..c249ea4ee 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1116,7 +1116,7 @@ sub setRootPassword {
if ($auth eq N_("LDAP")) {
$o->{authentication}{LDAP} ||= 'ldap.' . $o->{netc}{DOMAINNAME};
- $o->{netc}{LDAPDOMAIN} ||= join (',', map { "dc=$_" } split /\./, $o->{netc}{DOMAINNAME});
+ $o->{netc}{LDAPDOMAIN} ||= join(',', map { "dc=$_" } split /\./, $o->{netc}{DOMAINNAME});
$o->ask_from('',
N("Authentication LDAP"),
[ { label => N("LDAP Base dn"), val => \$o->{netc}{LDAPDOMAIN} },
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 37469827d..270f902e6 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -584,7 +584,7 @@ sub set {
symlink "../$main_charset/$_", "$dir/$LANG/$_" foreach @LCs, 'LC_MESSAGES';
#- getting LC_CTYPE (putting it directly in $LANG)
- install_any::getAndSaveFile ("Mandrake/mdkinst$dir/$charset/LC_CTYPE", "$dir/$LANG/LC_CTYPE");
+ install_any::getAndSaveFile("Mandrake/mdkinst$dir/$charset/LC_CTYPE", "$dir/$LANG/LC_CTYPE");
}
#- set all LC_* variables to a unique locale ("C"), and only redefine
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index d47874460..875da17b6 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -101,7 +101,7 @@ sub adsl_conf {
my ($adsl, $netc, $intf, $adsl_type) = @_;
adsl_conf_step_1:
- adsl_ask_info ($adsl, $netc, $intf) or return;
+ adsl_ask_info($adsl, $netc, $intf) or return;
adsl_conf_step_2:
$adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1;
adsl_conf_backend($adsl, $netc, $adsl_type);
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 4752258ce..bee1c283a 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -174,7 +174,7 @@ sub configureNetwork {
local $_;
any::load_category($in, 'network/main|usb|pcmcia', !$::expert, 1) or return;
my @l = detect_devices::getNet() or die N("no network card found");
- my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef);
+ my @all_cards = conf_network_card_backend($netc, $intf, undef, undef, undef, undef);
configureNetwork_step_1:
my $n_card = 0;
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 0466c4030..b485c2e1c 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -101,7 +101,7 @@ sub isdn_write_config_backend {
symlinkf("ioptions" . $bundle, "$prefix/etc/ppp/ioptions");
} else {
my $f = "$prefix/etc/isdn/profile/link/myisp";
- output ($f,
+ output($f,
qq(
I4L_USERNAME="$isdn->{login}"
I4L_SYSNAME=""
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 8f0a78683..1e3ab537f 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -67,7 +67,7 @@ sub detect {
modules::load_category('network/main|usb');
require network::ethernet;
network::ethernet->import;
- my @all_cards = conf_network_card_backend (undef, undef, undef, undef, undef, undef);
+ my @all_cards = conf_network_card_backend(undef, undef, undef, undef, undef, undef);
map { $auto_detect->{lan}{$_->[0]} = $_->[1] } @all_cards if !$net_install;
my $adsl = {};
@@ -121,7 +121,7 @@ sub init_globals {
sub main {
my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $first_time, $direct_fr, $noauto) = @_;
- init_globals ($in, $prefix);
+ init_globals($in, $prefix);
$netc->{minus_one} = 0; #When one configure an eth in dhcp without gateway
$::isInstall and $in->set_help('configureNetwork');
$::isStandalone and read_net_conf($prefix, $netcnx, $netc); # REDONDANCE with intro. FIXME
@@ -350,7 +350,7 @@ sub save_conf {
modules::load_category('network/main|usb');
require network::ethernet;
network::ethernet->import;
- my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef);
+ my @all_cards = conf_network_card_backend($netc, $intf, undef, undef, undef, undef);
$intf = { %$intf };
@@ -560,7 +560,7 @@ sub load_conf {
/^DOMAINNAME2=(.*)$/ and $netc->{DOMAINNAME2} = $1;
}
}
- $system_name && $domain_name and $netc->{HOSTNAME} = join ('.', $system_name, $domain_name);
+ $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';
$netcnx->{adsl_pptp} = $adsl_pptp;
@@ -609,13 +609,13 @@ sub set_net_conf {
sub start_internet {
my ($o) = @_;
- init_globals ($o, $o->{prefix});
+ init_globals($o, $o->{prefix});
run_program::rooted($prefix, $connect_file);
}
sub stop_internet {
my ($o) = @_;
- init_globals ($o, $o->{prefix});
+ init_globals($o, $o->{prefix});
run_program::rooted($prefix, $disconnect_file);
}
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index b99bc38b7..35882507f 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -257,14 +257,14 @@ sub dns {
my $mask = masked_ip($ip);
my @masked = masked_ip($ip) =~ $ip_regexp;
$masked[3] = 2;
- join (".", @masked);
+ join ".", @masked;
}
sub gateway {
my ($ip) = @_;
my @masked = masked_ip($ip) =~ $ip_regexp;
$masked[3] = 1;
- join (".", @masked);
+ join ".", @masked;
}
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 78075fd68..55c8b8a89 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -18,7 +18,7 @@ sub write_cnx_script {
$netc->{internet_cnx}{$type}{type} = $type2;
} else {
foreach ($connect_file, $disconnect_file) {
- output ("$prefix$_",
+ output("$prefix$_",
'#!/bin/bash
' . if_(!$netc->{at_boot}, 'if [ "x$1" == "x--boot_time" ]; then exit; fi
') . $netc->{internet_cnx}{$netc->{internet_cnx_choice}}{$_});
@@ -223,7 +223,7 @@ sub disconnected {}
sub write_initscript {
- output ("$prefix/etc/rc.d/init.d/internet", sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file));
+ output("$prefix/etc/rc.d/init.d/internet", sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file));
#!/bin/bash
#
# internet Bring up/down internet connection
@@ -269,7 +269,7 @@ exit 0
EOF
chmod 0755, "$prefix/etc/rc.d/init.d/internet";
$::isStandalone ? system("/sbin/chkconfig --add internet") : do {
- symlinkf ("../init.d/internet", "$prefix/etc/rc.d/rc$_") foreach
+ symlinkf("../init.d/internet", "$prefix/etc/rc.d/rc$_") foreach
'0.d/K11internet', '1.d/K11internet', '2.d/K11internet', '3.d/S89internet', '5.d/S89internet', '6.d/K11internet';
};
}
diff --git a/perl-install/printer/common.pm b/perl-install/printer/common.pm
index 7742bcf71..f78d47b90 100644
--- a/perl-install/printer/common.pm
+++ b/perl-install/printer/common.pm
@@ -24,7 +24,7 @@ sub addentry {
}
}
push(@lines, $entry) if $sectionfound && !$entryinserted;
- return join ("\n", @lines);
+ return join "\n", @lines;
}
sub addsection {
@@ -57,7 +57,7 @@ sub removeentry {
}
}
}
- return join ("", @lines);
+ return join "", @lines;
}
sub removesection {
@@ -81,7 +81,7 @@ sub removesection {
}
}
}
- return join ("", @lines);
+ return join "", @lines;
}
1;
diff --git a/perl-install/printer/cups.pm b/perl-install/printer/cups.pm
index c932f1f81..6999c0063 100644
--- a/perl-install/printer/cups.pm
+++ b/perl-install/printer/cups.pm
@@ -19,7 +19,7 @@ sub get_remote_queues {
if ($2 =~ m!^ipp://([^/:]+)[:/]! &&
!$printer->{configured}{$queuename}) {
my $server = $1;
- push (@printerlist, "$queuename|$server");
+ push @printerlist, "$queuename|$server";
}
}
}
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 2c5b42e2e..bd73c51b8 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -32,7 +32,7 @@ sub whatNetPrinter {
push @portstoscan, "4010", "4020", "4030", "5503", "9100-9104" if $network;
return () if $#portstoscan < 0;
- my $portlist = join (",", @portstoscan);
+ my $portlist = join ",", @portstoscan;
# Which hosts should be scanned?
# (Applying nmap to a whole network is very time-consuming, because nmap
@@ -41,7 +41,7 @@ sub whatNetPrinter {
# hosts and then scanning only them, which is much faster)
my @hostips = getIPsInLocalNetworks();
return () if $#hostips < 0;
- my $hostlist = join (" ", @hostips);
+ my $hostlist = join " ", @hostips;
# Scan network for printers, the timeout settings are there to avoid
# delays caused by machines blocking their ports with a firewall
@@ -190,7 +190,7 @@ sub getSMBPrinterShares {
my $name = $1;
my $description = $2;
$description =~ s/^(\s*)//;
- push (@shares, { name => $name, description => $description });
+ push @shares, { name => $name, description => $description };
}
}
close F;
diff --git a/perl-install/printer/gimp.pm b/perl-install/printer/gimp.pm
index 2655c4340..c3a8908a7 100644
--- a/perl-install/printer/gimp.pm
+++ b/perl-install/printer/gimp.pm
@@ -43,7 +43,7 @@ sub configure {
}
}
# Add the printer entry
- if (!isprinterconfigured ($queue, $configfilecontent)) {
+ if (!isprinterconfigured($queue, $configfilecontent)) {
# Remove the old printer entry
$configfilecontent =
removeprinter($queue, $configfilecontent);
@@ -60,7 +60,7 @@ sub configure {
s/\n/\nCurrent-Printer: $printer->{DEFAULT}\n/s;
} else {
$configfilecontent =~ /^\s*Current\-Printer\s*:\s*(\S+)\s*$/m;
- if (!isprinterconfigured ($1, $configfilecontent)) {
+ if (!isprinterconfigured($1, $configfilecontent)) {
$configfilecontent =~
s/(Current\-Printer\s*:\s*)\S+/$1$printer->{DEFAULT}/;
}
@@ -114,7 +114,7 @@ sub addcupsremoteto {
# Load GIMP's printer config file
my $configfilecontent = readconfigfile($configfilename);
# Add the printer entry
- if (!isprinterconfigured ($queue, $configfilecontent)) {
+ if (!isprinterconfigured($queue, $configfilecontent)) {
# Remove the old printer entry
$configfilecontent = removeprinter($queue, $configfilecontent);
# Add the new printer entry
@@ -213,8 +213,8 @@ sub makeprinterentry {
sub findconfigfiles {
my @configfilenames;
- push (@configfilenames, ".gimp-1.2/printrc") if -d "$::prefix/usr/lib/gimp/1.2";
- push (@configfilenames, ".gimp-1.3/printrc") if -d "$::prefix/usr/lib/gimp/1.3";
+ push @configfilenames, ".gimp-1.2/printrc" if -d "$::prefix/usr/lib/gimp/1.2";
+ push @configfilenames, ".gimp-1.3/printrc" if -d "$::prefix/usr/lib/gimp/1.3";
my @filestotreat;
local *PASSWD;
open PASSWD, "< $::prefix/etc/passwd" or die "Cannot read /etc/passwd!\n";
@@ -239,7 +239,7 @@ sub findconfigfiles {
close F;
set_permissions("$::prefix$homedir/$file", "$uid.$gid") or next;
}
- push (@filestotreat, "$homedir/$file");
+ push @filestotreat, "$homedir/$file";
}
}
}
@@ -282,7 +282,7 @@ sub addentry {
}
}
push(@lines, $entry) if $sectionfound && !$entryinserted;
- return join ("\n", @lines);
+ return join("\n", @lines);
}
sub addprinter {
@@ -317,7 +317,7 @@ sub removeentry {
}
}
}
- return join ("", @lines);
+ return join "", @lines;
}
sub removeprinter {
@@ -341,7 +341,7 @@ sub removeprinter {
}
}
}
- return join ("", @lines);
+ return join "", @lines;
}
sub isprinterconfigured {
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 6eaa34561..d66b41385 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -403,7 +403,7 @@ sub read_printer_db(;$) {
# End of drivers block
$indrivers = 0;
} elsif (m!^\s*<driver>(.+)</driver>\s*$!) {
- push (@{$entry->{drivers}}, $1);
+ push @{$entry->{drivers}}, $1;
}
} elsif ($inautodetect) {
# We are inside the autodetect block of a printers entry
@@ -654,7 +654,7 @@ sub read_cups_printer_list {
} else {
$comment = N("(on this machine)");
}
- push (@printerlist, "$queuename $comment");
+ push @printerlist, "$queuename $comment";
}
}
close F;
@@ -679,11 +679,11 @@ sub get_cups_remote_queues {
!$printer->{configured}{$queuename}) {
$comment = N("On CUPS server \"%s\"", $1);
my $sep = "!";
- push (@printerlist,
+ push @printerlist,
($::expert ? N("CUPS") . $sep : "") .
N("Remote Printers") . "$sep$queuename: $comment"
. ($queuename eq $printer->{DEFAULT} ?
- N(" (Default)") : ""));
+ N(" (Default)") : "");
}
}
}
@@ -1237,7 +1237,7 @@ sub configure_hpoj {
s!varLock=\"/var/lock\"!varLock=\"$::prefix/var/lock\"!g;
s!varRunPrefix=\"/var/run\"!varRunPrefix=\"$::prefix/var/run\"!g;
}
- push (@ptalinitfunctions, $_);
+ push @ptalinitfunctions, $_;
}
}
close PTALINIT;
@@ -1357,7 +1357,7 @@ sub configure_hpoj {
my $line = <F>;
if ($line =~ /^\s*\S+\s+(\d+)\s+/) {
my $pid = $1;
- kill (15, $pid);
+ kill 15, $pid;
}
close F;
}
@@ -1371,7 +1371,7 @@ sub configure_hpoj {
# Determine the ptal device name from already existing config files
my $ptalprefix =
($bus eq "hpjd" ? "hpjd:" : "mlc:$bus:");
- my $ptaldevice = printer::hpoj::lookupDevname ($ptalprefix, $model_long,
+ my $ptaldevice = printer::hpoj::lookupDevname($ptalprefix, $model_long,
$serialnumber_long, $base_address);
# It's all done for us, the device is already configured
@@ -1390,7 +1390,7 @@ sub configure_hpoj {
printer::hpoj::deleteDevice($ptaldevice);
if ($bus eq "par") {
while (1) {
- my $oldDevname = printer::hpoj::lookupDevname ("mlc:par:",undef,undef,$base_address);
+ my $oldDevname = printer::hpoj::lookupDevname("mlc:par:",undef,undef,$base_address);
last unless defined($oldDevname);
printer::hpoj::deleteDevice($oldDevname);
}
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 4673992f9..e52e6fd34 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -141,13 +141,13 @@ sub setup_printer_connection {
# Choose the appropriate connection config dialog
my $done = 1;
for ($printer->{TYPE}) {
- /LOCAL/ and setup_local_autoscan ($printer, $in, $upNetwork) and last;
- /LPD/ and setup_lpd ($printer, $in, $upNetwork) and last;
- /SOCKET/ and setup_socket ($printer, $in, $upNetwork) and last;
- /SMB/ and setup_smb ($printer, $in, $upNetwork) and last;
- /NCP/ and setup_ncp ($printer, $in, $upNetwork) and last;
- /URI/ and setup_uri ($printer, $in, $upNetwork) and last;
- /POSTPIPE/ and setup_postpipe ($printer, $in) and last;
+ /LOCAL/ and setup_local_autoscan($printer, $in, $upNetwork) and last;
+ /LPD/ and setup_lpd( $printer, $in, $upNetwork) and last;
+ /SOCKET/ and setup_socket( $printer, $in, $upNetwork) and last;
+ /SMB/ and setup_smb( $printer, $in, $upNetwork) and last;
+ /NCP/ and setup_ncp( $printer, $in, $upNetwork) and last;
+ /URI/ and setup_uri( $printer, $in, $upNetwork) and last;
+ /POSTPIPE/ and setup_postpipe( $printer, $in) and last;
$done = 0; last;
}
return $done;
@@ -166,40 +166,40 @@ sub first_time_dialog {
my $localprinterspresent;
if (@autodetected == ()) {
$localprinterspresent = 0;
- push (@printerlist, N("There are no printers found which are directly connected to your machine"));
+ push @printerlist, N("There are no printers found which are directly connected to your machine");
} else {
$localprinterspresent = 1;
foreach my $printer (@autodetected) {
my $entry = $printer->{val}{DESCRIPTION};
- if ($entry) { push (@printerlist, " - $entry\n") }
+ if ($entry) { push @printerlist, " - $entry\n" }
}
my $morethanoneprinters = $#printerlist > 0;
my $unknown_printers = $#autodetected - $#printerlist;
if (@printerlist != ()) {
- unshift (@printerlist,
+ unshift @printerlist,
($morethanoneprinters ?
N("The following printers\n\n") :
- N("The following printer\n\n")));
+ N("The following printer\n\n"));
if ($unknown_printers == 1) {
- push (@printerlist, N("\nand one unknown printer are "));
+ push @printerlist, N("\nand one unknown printer are ");
} elsif ($unknown_printers > 1) {
- push (@printerlist, N("\nand %d unknown printers are ",
- $unknown_printers));
+ push @printerlist, N("\nand %d unknown printers are ",
+ $unknown_printers);
} else {
- push (@printerlist, ($morethanoneprinters ? N("\nare ") : N("\nis ")));
+ push @printerlist, ($morethanoneprinters ? N("\nare ") : N("\nis "));
}
- push (@printerlist, N("directly connected to your system"));
+ push @printerlist, N("directly connected to your system");
} else {
if ($unknown_printers == 1) {
- push (@printerlist, N("\nThere is one unknown printer directly connected to your system"));
+ push @printerlist, N("\nThere is one unknown printer directly connected to your system");
} elsif ($unknown_printers > 1) {
- push (@printerlist, N("\nThere are %d unknown printers directly connected to your system",
- $unknown_printers));
+ push @printerlist, N("\nThere are %d unknown printers directly connected to your system",
+ $unknown_printers);
}
}
}
- push (@printerlist,
- N(" (Make sure that all your printers are connected and turned on).\n"));
+ push @printerlist,
+ N(" (Make sure that all your printers are connected and turned on).\n");
my $localprinters = join('', @printerlist);
# Do we have a local network?
@@ -607,7 +607,7 @@ sub setup_local_autoscan {
# Do configuration of multi-function devices and look up model name
# in the printer database
- setup_common ($printer, $in, $menuchoice, $device, $do_auto_detect,
+ setup_common($printer, $in, $menuchoice, $device, $do_auto_detect,
@autodetected);
1;
@@ -675,7 +675,7 @@ complete => sub {
# Do configuration of multi-function devices and look up model name
# in the printer database
- setup_common ($printer, $in,
+ setup_common($printer, $in,
"$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}",
$printer->{currentqueue}{connect}, $auto_hpoj,
({port => $printer->{currentqueue}{connect},
@@ -1098,7 +1098,7 @@ sub setup_socket {
# Do configuration of multi-function devices and look up model name
# in the printer database
- setup_common ($printer, $in,
+ setup_common($printer, $in,
"$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}",
$printer->{currentqueue}{connect}, $auto_hpoj,
({port => $printer->{currentqueue}{connect},
@@ -1183,7 +1183,7 @@ complete => sub {
# Do configuration of multi-function devices and look up model name
# in the printer database
- setup_common ($printer, $in,
+ setup_common($printer, $in,
"$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}",
$printer->{currentqueue}{connect}, $auto_hpoj,
({port => $printer->{currentqueue}{connect},
@@ -1417,7 +1417,7 @@ sub setup_common {
$printer->{DBENTRY} = $entry;
}
}
- $printer->{DBENTRY} ||= bestMatchSentence ($descr, keys %printer::main::thedb);
+ $printer->{DBENTRY} ||= bestMatchSentence($descr, keys %printer::main::thedb);
# If the manufacturer was not guessed correctly, discard the
# guess.
$printer->{DBENTRY} =~ /^([^\|]+)\|/;
@@ -2153,11 +2153,11 @@ Note: the photo test page can take a rather long time to get printed and on lase
$in->do_pkgs->install('ImageMagick');
}
# set up list of pages to print
- $standard && push (@testpages, $stdtestpage);
- $altletter && push (@testpages, $altlttestpage);
- $alta4 && push (@testpages, $alta4testpage);
- $photo && push (@testpages, $phototestpage);
- $ascii && push (@testpages, $asciitestpage);
+ $standard && push @testpages, $stdtestpage;
+ $altletter && push @testpages, $altlttestpage;
+ $alta4 && push @testpages, $alta4testpage;
+ $photo && push @testpages, $phototestpage;
+ $ascii && push @testpages, $asciitestpage;
# print the stuff
@lpq_output = printer::main::print_pages($printer, @testpages);
}
@@ -2354,9 +2354,9 @@ sub copy_queues_from {
$newspoolerstr = $printer::shortspooler_inv{$newspooler};
$oldspoolerstr = $printer::shortspooler_inv{$oldspooler};
foreach (@oldqueues) {
- push (@queuesselected, 1);
- push (@queueentries, { text => $_, type => 'bool',
- val => \$queuesselected[$#queuesselected] });
+ push @queuesselected, 1;
+ push @queueentries, { text => $_, type => 'bool',
+ val => \$queuesselected[$#queuesselected] };
}
# LPRng and LPD use the same config files, therefore one sees the
# queues of LPD when one uses LPRng and vice versa, but these queues
@@ -2854,12 +2854,12 @@ sub main {
0) ? "\@addprinter" : "\@quit";
if ($menuchoice ne "\@quit") {
$printer->{SPOOLER} ||=
- setup_default_spooler ($printer, $in, $upNetwork) ||
+ setup_default_spooler($printer, $in, $upNetwork) ||
return;
}
} else {
# Ask for a spooler when none is defined
- $printer->{SPOOLER} ||= setup_default_spooler ($printer, $in, $upNetwork) || return;
+ $printer->{SPOOLER} ||= setup_default_spooler($printer, $in, $upNetwork) || return;
# This entry and the check for this entry have to use
# the same translation to work properly
my $spoolerentry = N("Printing system: ");
@@ -3022,7 +3022,7 @@ sub main {
}
# Function to switch to another spooler
if ($menuchoice eq "\@spooler") {
- $printer->{SPOOLER} = setup_default_spooler ($printer, $in, $upNetwork) || $printer->{SPOOLER};
+ $printer->{SPOOLER} = setup_default_spooler($printer, $in, $upNetwork) || $printer->{SPOOLER};
next;
}
# Rip the queue name out of the chosen menu entry
diff --git a/perl-install/resize_fat/fat.pm b/perl-install/resize_fat/fat.pm
index 71c50790e..c08232628 100644
--- a/perl-install/resize_fat/fat.pm
+++ b/perl-install/resize_fat/fat.pm
@@ -76,7 +76,7 @@ sub update {
is_eof($old_next) ?
set_eof($fs, $new) :
- set_next ($fs, $new, $new_next);
+ set_next($fs, $new, $new_next);
}
}
}
@@ -113,7 +113,7 @@ sub is_eof($) {
}
sub set_eof($$) {
my ($fs, $cluster) = @_;
- set_next ($fs, $cluster, $resize_fat::bad_cluster_value + 1);
+ set_next($fs, $cluster, $resize_fat::bad_cluster_value + 1);
}
#- returns true if <cluster> is empty. Note that this includes bad clusters.
@@ -129,7 +129,7 @@ sub is_available($) {
}
sub set_available($$) {
my ($fs, $cluster) = @_;
- set_next ($fs, $cluster, 0);
+ set_next($fs, $cluster, 0);
}
1;
diff --git a/perl-install/resize_fat/io.pm b/perl-install/resize_fat/io.pm
index 4f769eb11..054fb0858 100644
--- a/perl-install/resize_fat/io.pm
+++ b/perl-install/resize_fat/io.pm
@@ -43,7 +43,7 @@ sub read_file($$) {
my ($fs, $cluster) = @_;
my $buf = '';
- for (; !resize_fat::fat::is_eof($cluster); $cluster = resize_fat::fat::next ($fs, $cluster)) {
+ for (; !resize_fat::fat::is_eof($cluster); $cluster = resize_fat::fat::next($fs, $cluster)) {
$cluster == 0 and die "Bad FAT: unterminated chain\n";
$buf .= read_cluster($fs, $cluster);
}
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 1eeb38e61..bec3b3b29 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -250,7 +250,7 @@ sub ask_standalone_gtk {
$x = $e->{'x'}+$ox; $y = $e->{'y'}+$oy });
$b->signal_connect(button_press_event => sub { $nopop->() });
$::isEmbedded and Gtk->main_iteration while Gtk->events_pending;
- $::isEmbedded and kill (12, $::CCPID);
+ $::isEmbedded and kill 12, $::CCPID;
$W->main or return;
$on_services;
}
diff --git a/perl-install/ugtk.pm b/perl-install/ugtk.pm
index 63d9ba153..3ec92e77f 100644
--- a/perl-install/ugtk.pm
+++ b/perl-install/ugtk.pm
@@ -667,7 +667,7 @@ sub create_pix_text {
$font and $style->font(Gtk::Gdk::Font->fontset_load($font));
}
$fake_darea->set_style($style);
- my ($width, $height, $lines, $widths, $heights) = get_text_coord (
+ my ($width, $height, $lines, $widths, $heights) = get_text_coord(
$text, $fake_darea, $max_width, $max_height, $can_be_greater, $can_be_smaller, $centeredx, $centeredy);
my $pix;
my $j = 0;
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-01 16:06:53 +0000