X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha_perl_deps.pl;h=54e6de0b75c04ea924ca30bd7d997d8b516b17f9;hb=91220134e63a2265655ffaca0c399caae3bbaf1b;hp=5557f7a29de6b85c36fc4a469f2b60ab6886d8cf;hpb=e744cd9fe5841895e7f636ace1aef84004939669;p=koha.git

diff --git a/koha_perl_deps.pl b/koha_perl_deps.pl
index 5557f7a29d..54e6de0b75 100755
--- a/koha_perl_deps.pl
+++ b/koha_perl_deps.pl
@@ -7,7 +7,10 @@ use FindBin; # we need to enforce which C4::Installer is used in case more than
 
 use lib $FindBin::Bin;
 
-use C4::Installer;
+use C4::Installer::PerlModules;
+
+use strict;
+use warnings;
 
 my $help = 0;
 my $missing = 0;
@@ -15,6 +18,8 @@ my $installed = 0;
 my $upgrade = 0;
 my $all = 0;
 my $color = 0;
+my $brief = 0;
+my $req = 0;
 
 GetOptions(
             'h|help|?'    => \$help,
@@ -22,6 +27,8 @@ GetOptions(
             'i|installed' => \$installed,
             'u|upgrade'   => \$upgrade,
             'a|all'       => \$all,
+            'b|brief'     => \$brief,
+            'r|required'  => \$req,
             'c|color'     => \$color,
           );
 
@@ -36,11 +43,14 @@ push @pm, 'missing_pm' if $missing || $all;
 push @pm, 'upgrade_pm' if $upgrade || $all;
 push @pm, 'current_pm' if $installed || $all;
 
-print color 'bold white' if $color;
-print"
-Module Name                                 Current Version                       Required Version         Module Required
---------------------------------------------------------------------------------------------------------------------------
+if (!$brief) {
+    print color 'bold blue' if $color;
+    print"
+                                              Installed         Required          Module is
+Module Name                                   Version           Version            Required
+--------------------------------------------------------------------------------------------
 ";
+}
 
 my $count = 0;
 foreach my $type (@pm) {
@@ -52,31 +62,45 @@ foreach my $type (@pm) {
             print color 'yellow' if $type eq 'upgrade_pm' && $color;
             print color 'red' if $type eq 'missing_pm' && $color;
             print color 'green' if $type eq 'current_pm' && $color;
-            $count++;
             my $required = ($_->{$pm}->{'required'}?'Yes':'No');
             my $current_version = ($color ? $_->{$pm}->{'cur_ver'} :
                                    $type eq 'missing_pm' || $type eq 'upgrade_pm' ? $_->{$pm}->{'cur_ver'}." *" : $_->{$pm}->{'cur_ver'});
+            if (!$brief) {
+                if (($req && $required eq 'Yes') || !$req) {
 format =
-@<<<<<<<<<<<<<<<<<<<<<<<<<                  @<<<<<<<<<<                           @<<<<<<<<<<              @<<<<<
-$pm,                                        $current_version,                     $_->{$pm}->{'min_ver'},  $required
+@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<       @<<<<<
+$pm,                                          $current_version, $_->{$pm}->{'min_ver'},  $required
 .
 write;
+                    $count++;
+                }
+            }
+            else {
+                if (($req && $required eq 'Yes') || !$req) {
+                    print "$pm\n";
+                    $count++;
+                }
+            }
         }
     }
 }
-print color 'bold white' if $color;
-my $footer = "
---------------------------------------------------------------------------------------------------------------------------
-Total modules reported: $count                                                     ";
 
-if ($color) {
-    $footer .= "\n\n";
-}
-else {
-    $footer .= "* Module is missing or requires an upgrade.\n\n";
-}
+if (!$brief) {
+    print color 'bold blue' if $color;
+    my $footer = "
+--------------------------------------------------------------------------------------------
+Total modules reported: $count                      ";
+
+    if ($color) {
+        $footer .= "\n\n";
+    }
+    else {
+        $footer .= "* Module is missing or requires an upgrade.\n\n";
+    }
 
-print $footer;
+    print $footer;
+    print color 'reset' if $color;
+}
 
 1;
 
@@ -88,7 +112,12 @@ koha_perl_deps.pl
 
 =head1 SYNOPSIS
 
-./koha_perl_deps.pl -m
+ At least one of -a, -m, -i, or -u flags must specified to not trigger help.
+ ./koha_perl_deps.pl -m [-b] [-r] [-c]
+ ./koha_perl_deps.pl -u [-b] [-r] [-c]
+ ./koha_perl_deps.pl -i [-b] [-r] [-c]
+ ./koha_perl_deps.pl -a [-b] [-r] [-c]
+ ./koha_perl_deps.pl [-[h?]]
 
 =head1 OPTIONS
 
@@ -108,7 +137,16 @@ lists all perl modules needing to be upgraded relative to Koha
 
 =item B<-a|--all>
 
-lists all koha perl dependencies
+ lists all koha perl dependencies
+ This is equivalent to '-m -i -u'.
+
+=item B<-b|--brief>
+
+lists only the perl dependency name.
+
+=item B<-r|--required>
+
+filters list to only required perl dependencies.
 
 =item B<-c|--color>
 
@@ -135,8 +173,9 @@ This file is part of Koha.
 Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software
 Foundation; either version 2 of the License, or (at your option) any later version.
 
-You should have received a copy of the GNU General Public License along with Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307 USA
+You should have received a copy of the GNU General Public License along
+with Koha; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 DISCLAIMER OF WARRANTY