Argh. Gonna get total in there eventually.

virtualmin · Jul 28, 2017 · e5fdeb8 · e5fdeb8
1 parent b670bec
commit e5fdeb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/Virtualmin/Config.pm b/lib/Virtualmin/Config.pm
@@ -58,7 +58,7 @@ sub run {
   for (@plugins) {
     my $pkg = "Virtualmin::Config::Plugin::$_";
     load $pkg || die "Loading Plugin failed: $_";
-    my $plugin = $pkg->new( { total => $total } );
+    my $plugin = $pkg->new({$total => $total});
     $plugin->actions();
     if ($self->{test} && $plugin->can('tests')) {
       $plugin->tests();

diff --git a/lib/Virtualmin/Config/Plugin.pm b/lib/Virtualmin/Config/Plugin.pm
@@ -23,7 +23,7 @@ my $log = Log::Log4perl->get_logger("virtualmin-config-system");
 sub new {
   my ($class, %args) = @_;
 
-  my $self = {name => $args{name}, depends => $args{depends}, total => $args{ total }};
+  my $self = {name => $args{name}, depends => $args{depends}, total => $args{total}};
   bless $self, $class;
 
   return $self;
@@ -54,9 +54,8 @@ sub total {
 sub spin {
   my $self    = shift;
   my $name    = $self->name();
-  my $total   = $self->total();
   my $message = shift // "Configuring " . $name;
-  $message = "[" . YELLOW . $count . RESET . "/" . GREEN . $total .
+  $message = "[" . YELLOW . $count . RESET . "/" . GREEN . $self->total() .
     RESET . "] " . $message;
   $count++;
   $log->info($message);