summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/detect_devices.pm6
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/my_gtk.pm4
3 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 5f2e88749..e3b053fa0 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -690,7 +690,7 @@ sub getIPsInLocalNetworks {
# Read the output of "ifconfig" to determine the broadcast addresses of
# the local networks
my $dev_is_localnet = 0;
- my @local_bcasts = ();
+ my @local_bcasts;
my $current_bcast = "";
if (-x "/sbin/ifconfig") {
@@ -727,7 +727,7 @@ sub getIPsInLocalNetworks {
for my $bcast (@local_bcasts) {
local *F;
open F, "ping -w 1 -b -n $bcast | cut -f 4 -d \" \" | sed s/:// | egrep \"^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+\" | uniq |" or next;
- while (<F>) {chomp; push @addresses, $_;}
+ while (<F>) { chomp; push @addresses, $_ }
close F;
}
@@ -742,7 +742,7 @@ sub whatNetPrinter {
my @res;
# Which ports should be scanned?
- my @portstoscan = ();
+ my @portstoscan;
if ($smb) {
push @portstoscan, "139";
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 445d8f3ca..6cee89be3 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -479,6 +479,7 @@ sub setAuthentication {
#- defer running smbpassword - no network yet
$winbind = $winbind . "%" . $winpass;
addToBeDone {
+ require install_steps;
install_steps::upNetwork($o, 'pppAvoided');
run_program::rooted($o->{prefix}, "/usr/bin/smbpasswd", "-j", $domain, "-U", $winbind);
} 'configureNetwork';
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 458164a8f..28abc7ceb 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -279,7 +279,7 @@ sub ask_warn { my $w = my_gtk->new(shift @_); $w->_ask_warn(@_); main($w)
sub ask_yesorno { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Yes"), _("No")); main($w) }
sub ask_okcancel { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Is this correct?"), _("Ok"), _("Cancel")); main($w) }
sub ask_from_entry { my $w = my_gtk->new(shift @_); $w->_ask_from_entry(@_); main($w) }
-sub ask_dir { my $w = my_gtk->new(shift @_); $w->_ask_dir(@_); main($w); }
+sub ask_dir { my $w = my_gtk->new(shift @_); $w->_ask_dir(@_); main($w) }
sub _ask_from_entry($$@) {
my ($o, @msgs) = @_;
@@ -496,7 +496,7 @@ sub ask_browse_tree_info_given_widgets {
@{$ptree{$_}} = difference2($ptree{$_}, \@to_remove);
}
if (exists $wtree{$cat}) {
- delete $wtree{$cat}->{$_} foreach qw(state state_stats);
+ delete $wtree{$cat}{$_} foreach qw(state state_stats);
$w->{tree}->remove_node($wtree{$cat});
delete $wtree{$cat};
}