Versionen im installcheck anzeigen.

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index e8670761c918f8354ee8862ceebc77471f536b95..0d1ab8bd5e13af3be0da995cdfe0ec2cb946b9f4 100644 (file)
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -51,7 +51,13 @@ sub module_available {
   my $module  = $_[0];
   my $version = $_[1] || '' ;
 
   my $module  = $_[0];
   my $version = $_[1] || '' ;
 

-  return eval "use $module $version; 1";
+  my $got = eval "use $module $version; 1";
+
+  if ($got) {
+    return ($got, $module->VERSION);
+  } else {
+    return
+  }

 }
 
 sub check_kpsewhich {
 }
 
 sub check_kpsewhich {

diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 0f0dc202be12d2abb0e5281938ccb5cdb50b9232..48a51fd4d43c1c33d5811072c0c4047073d6521e 100755 (executable)
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -123,8 +123,13 @@ sub check_module {
   my ($module, %role) = @_;
 
   my $line = "Looking for $module->{fullname}";
   my ($module, %role) = @_;
 
   my $line = "Looking for $module->{fullname}";

-  my $res = SL::InstallationCheck::module_available($module->{"name"}, $module->{version});
-  print_result($line, $res);
+  my ($res, $ver) = SL::InstallationCheck::module_available($module->{"name"}, $module->{version});
+  if ($res) {
+    print_line($line, $ver || 'no version', 'green');
+  } else {
+    print_result($line, $res);
+  }
+

 
   return if $res;
 
 
   return if $res;
 


@@ -178,8 +183,17 @@ sub mycolor {
 
 sub print_result {
   my ($test, $exit) = @_;
 
 sub print_result {
   my ($test, $exit) = @_;

-  print $test, " ", ('.' x (72 - length $test));
-  print $exit ? '.... '. mycolor('ok', 'green') : ' '. mycolor('NOT ok', 'red');
+  if ($exit) {
+    print_line($test, 'ok', 'green');
+  } else {
+    print_line($test, 'NOT ok', 'red');
+  }
+}
+
+sub print_line {
+  my ($text, $res, $color) = @_;
+  print $text, " ", ('.' x (78 - length($text) - length($res)));
+  print mycolor($res, $color);

   print "\n";
   return;
 }
   print "\n";
   return;
 }