X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Finstallation_check.pl;h=6a65ec5e64be7894e0b57afe2839a9a5c0b96a1e;hb=f26083d9a08116e4d2a72f975f3bc2b81955dcea;hp=40e312f1bd038fdff8fea532114ea631a2057918;hpb=ebbabed8bb971d3e17e3188e55310f99429a456f;p=kivitendo-erp.git

diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 40e312f1b..6a65ec5e6 100755
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -42,7 +42,6 @@ my %check;
 Getopt::Long::Configure ("bundling");
 GetOptions(
   "v|verbose"   => \ my $v,
-  "V|no-verbose"   => \ my $nv,
   "a|all"       => \ $check{a},
   "o|optional!" => \ $check{o},
   "d|devel!"    => \ $check{d},
@@ -50,7 +49,7 @@ GetOptions(
   "r|required!" => \ $check{r},
   "h|help"      => sub { pod2usage(-verbose => 2) },
   "c|color!"    => \ ( my $c = 1 ),
-  "i|install!"  => \ my $apt,
+  "i|install-command!"  => \ my $apt,
 );
 
 my %install_methods = (
@@ -60,15 +59,6 @@ my %install_methods = (
   cpan   => { key => 'name',   install => "sudo cpan",            system => "CPAN" },
 );
 
-# verbos is default
-if ( $v && $nv ){
-  $v = 1;
-}elsif ($nv){
-  undef $v;
-}else{
-  $v = 1;
-}
-
 # if nothing is requested check "required"
 my $default_run;
 if (!defined $check{a}
@@ -97,7 +87,6 @@ if (!SL::LxOfficeConf->read(undef, 'may fail')) {
 if ($check{r}) {
   print_header('Checking Required Modules');
   check_module($_, required => 1) for @SL::InstallationCheck::required_modules;
-  print_header('Standard check for required modules done. See additional parameters for more checks (--help)') if $default_run;
 }
 if ($check{o}) {
   print_header('Checking Optional Modules');
@@ -111,8 +100,30 @@ if ($check{l}) {
   check_latex();
 }
 
+my $fail = @missing_modules;
+print_header('Result');
+print_line('All', $fail ? 'NOT ok' : 'OK', $fail ? 'red' : 'green');
+
+if ($default_run) {
+  if (@missing_modules) {
+    $apt = 1;
+  print <<"EOL";
+
+HEY! It seems there are modules MISSING! Look for the red lines with "NOT ok"
+above. You'll want to fix those, I've enabled --install-command for you...
+EOL
+  } else {
+  print <<"EOL";
+
+Standard check done, everything is OK and up to date. Have a look at the --help
+section of this script to see some more advanced checks for developer and
+optional dependancies, as well as LaTeX packages you might need.
+EOL
+  }
+}
+
 if (@missing_modules && $apt) {
-  print "\nHere are some sample installation lines, choose one apporpriate for your system:\n\n";
+  print "\nHere are some sample installation lines, choose one appropriate for your system:\n\n";
   local $Text::Wrap::separator = " \\\n";
 
   for (keys %install_methods) {
@@ -228,20 +239,17 @@ EOL
 sub module_source_texts {
   my ($module) = @_;
   my @texts;
-  push @texts, <<EOL;
-  - You can get it from CPAN:
-      perl -MCPAN -e "install $module->{name}"
+  for my $key (keys %install_methods) {
+    my $method = $install_methods{$key};
+    push @texts, <<"EOL" if $module->{$method->{key}};
+  - Using $method->{system} you can install it with $key:
+      $method->{install} $module->{$method->{key}}
 EOL
+  }
   push @texts, <<EOL if $module->{url};
   - You can download it from this URL and install it manually:
       $module->{url}
 EOL
-  push @texts, <<EOL if $module->{debian};
-  - On Debian, Ubuntu and other distros you can install it with apt-get:
-      sudo apt-get install $module->{debian}
-    Note: These may be out of date as well if your system is old.
-EOL
- # TODO: SuSE and Fedora packaging. Windows packaging.
 
   return @texts;
 }
@@ -344,15 +352,11 @@ Probe for LaTeX documentclasses and packages in master templates.
 
 Don't probe for LaTeX document classes and packages in master templates. (Useful in combination with --all)
 
-=item C<-v, --verbose>
-
-Print additional info for missing dependancies (enabled by default)
-
-=item C<-V, --no-verbose>
+=item C<-v. --verbose>
 
-Disable verbosity
+Print additional info for missing dependancies
 
-=item C<-i, --install>
+=item C<-i, --install-command>
 
 Tries to generate installation commands for the most common package managers.
 Note that these lists can be slightly off, but it should still save you a lot