summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm6
-rw-r--r--perl-install/partition_table/raw.pm2
-rw-r--r--perl-install/printer.pm30
-rw-r--r--perl-install/printerdrake.pm4
4 files changed, 21 insertions, 21 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 91691d0ea..bd506f210 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -817,8 +817,8 @@ sub write_lilo_conf {
print F "timeout=", round(10 * $lilo->{timeout}) if $lilo->{timeout};
print F "serial=", $1 if get_append($lilo, 'console') =~ /ttyS(.*)/;
- print F "message=/boot/message" if (arch() !~ /ia64/);
- print F "menu-scheme=wb:bw:wb:bw" if (arch() !~ /ia64/);
+ print F "message=/boot/message" if arch() !~ /ia64/;
+ print F "menu-scheme=wb:bw:wb:bw" if arch() !~ /ia64/;
print F "ignore-table" if grep { $_->{unsafe} && $_->{table} } @{$lilo->{entries}};
@@ -868,7 +868,7 @@ sub install_lilo {
log::l("Installing boot loader...");
$::testing and return;
- run_program::rooted_or_die($::prefix, "lilo", "2>", "/tmp/.error") if (arch() !~ /ia64/);
+ run_program::rooted_or_die($::prefix, "lilo", "2>", "/tmp/.error") if arch() !~ /ia64/;
unlink "$::prefix/tmp/.error";
}
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index 47e275a2d..454aa0856 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -145,7 +145,7 @@ sub zero_MBR {
#- force the standard partition type for the architecture
my $type = arch() =~ /ia64/ ? 'gpt' : arch() eq "alpha" ? "bsd" : arch() =~ /^sparc/ ? "sun" : arch() eq "ppc" ? "mac" : "dos";
#- override standard mac type on PPC for IBM machines to dos
- $type = "dos" if (arch() =~ /ppc/ && detect_devices::get_mac_model() =~ /^IBM/);
+ $type = "dos" if arch() =~ /ppc/ && detect_devices::get_mac_model() =~ /^IBM/;
require("partition_table/$type.pm");
bless $hd, "partition_table::$type";
$hd->{primary} = $hd->clear_raw();
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 28f0edddd..73328070a 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -1972,7 +1972,7 @@ sub configure_hpoj {
last;
}
# No, it is not an HP multi-function device.
- return "" if (!$device_ok);
+ return "" if !$device_ok;
# Determine the ptal device name from already existing config files
my $ptalprefix =
@@ -2270,9 +2270,9 @@ sub removelocalprintersfromapplications {
sub setcupslink {
my ($printer) = @_;
- return 1 if (!$::isInstall);
- return 1 if ($printer->{SPOOLER} ne "cups");
- return 1 if (-d "/etc/cups/ppd");
+ return 1 if !$::isInstall;
+ return 1 if $printer->{SPOOLER} ne "cups";
+ return 1 if -d "/etc/cups/ppd";
system("ln -sf $prefix/etc/cups /etc/cups");
return 1;
}
@@ -2466,7 +2466,7 @@ sub addcupsremotetostaroffice {
for my $listentry (@printerlist) {
next if !($listentry =~ /^([^\|]+)\|([^\|]+)$/);
my $q = $1;
- next if ($q ne $queue);
+ next if $q ne $queue;
my $server = $2;
# Remove server name from queue name
$q =~ s/^([^@]*)@.*$/$1/;
@@ -2516,7 +2516,7 @@ sub addcupsremotetoopenoffice {
for my $listentry (@printerlist) {
next if !($listentry =~ /^([^\|]+)\|([^\|]+)$/);
my $q = $1;
- next if ($q ne $queue);
+ next if $q ne $queue;
my $server = $2;
# Remove server name from queue name
$q =~ s/^([^@]*)@.*$/$1/;
@@ -2906,7 +2906,7 @@ sub removeentry {
my @lines = split("\n", $filecontent);
foreach (@lines) {
$_ = "$_\n";
- next if ($done);
+ next if $done;
if (!$sectionfound) {
if (/^\s*\[\s*$section\s*\]\s*$/) {
$sectionfound = 1;
@@ -2930,7 +2930,7 @@ sub removesection {
my @lines = split("\n", $filecontent);
foreach (@lines) {
$_ = "$_\n";
- next if ($done);
+ next if $done;
if (!$sectionfound) {
if (/^\s*\[\s*$section\s*\]\s*$/) {
$_ = "";
@@ -3024,7 +3024,7 @@ sub addcupsremotetogimp {
for my $listentry (@printerlist) {
next if !($listentry =~ /^([^\|]+)\|([^\|]+)$/);
my $q = $1;
- next if ($q ne $queue);
+ next if $q ne $queue;
my $server = $2;
# Remove server name from queue name
$q =~ s/^([^@]*)@.*$/$1/;
@@ -3189,7 +3189,7 @@ sub findgimpconfigfiles {
for my $file (@configfilenames) {
my $dir = "$homedir/$file";
$dir =~ s:/[^/]*$::;
- next if ((-f $dir) && (! -d $dir));
+ next if (-f $dir) && (! -d $dir);
if (! -d "$prefix$dir") {
run_program::rooted($prefix,
"/bin/mkdir", $dir)
@@ -3278,7 +3278,7 @@ sub removegimpentry {
my @lines = split("\n", $filecontent);
foreach (@lines) {
$_ = "$_\n";
- next if ($done);
+ next if $done;
if (!$sectionfound) {
if (/^\s*Printer\s*:\s*($section)\s*$/) {
$sectionfound = 1;
@@ -3302,7 +3302,7 @@ sub removegimpprinter {
my @lines = split("\n", $filecontent);
foreach (@lines) {
$_ = "$_\n";
- next if ($done);
+ next if $done;
if (!$sectionfound) {
if (/^\s*Printer\s*:\s*($section)\s*$/) {
$_ = "";
@@ -3328,7 +3328,7 @@ sub isgimpprinterconfigured {
my $nonrawprinting = 0;
my @lines = split("\n", $filecontent);
foreach (@lines) {
- last if ($done);
+ last if $done;
if (!$sectionfound) {
if (/^\s*Printer\s*:\s*($queue)\s*$/) {
$sectionfound = 1;
@@ -3345,8 +3345,8 @@ sub isgimpprinterconfigured {
}
}
}
- return 0 if ($done && !$sectionfound);
- return 1 if ($ppdfileset || $drivernotps2 || $nonrawprinting);
+ return 0 if $done && !$sectionfound;
+ return 1 if $ppdfileset || $drivernotps2 || $nonrawprinting;
return 0;
}
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 32edbb867..394c105e5 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2959,7 +2959,7 @@ sub wizard_close {
$::Wizard_no_previous = 1;
$::Wizard_no_cancel = 1;
$::Wizard_finished = 1;
- wizard_congratulations($in) if ($mode == 1);
+ wizard_congratulations($in) if $mode == 1;
undef $::isWizard;
$::WizardWindow->destroy if defined $::WizardWindow;
undef $::WizardWindow;
@@ -3364,7 +3364,7 @@ sub main {
$queue = $printer->{QUEUE};
}
};
- wizard_close($in, 0) if ($@ =~ /wizcancel/);
+ wizard_close($in, 0) if $@ =~ /wizcancel/;
} else {
$::expert or $printer->{TYPE} = "LOCAL";
wizard_welcome($printer, $in, $upNetwork) or next;