ShellQuote auch im InstallationCheck

[kivitendo-erp.git] / SL / InstallationCheck.pm

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index 4fcf97e..5f97768 100644 (file)
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -3,38 +3,48 @@ package SL::InstallationCheck;
 use English '-no_match_vars';
 use IO::File;
 
-use vars qw(@required_modules @optional_modules);
+use vars qw(@required_modules @optional_modules @developer_modules);
 
 use strict;
 
 BEGIN {
 @required_modules = (
-  { name => "parent",                              url => "http://search.cpan.org/~corion/" },
-  { name => "Archive::Zip",    version => '1.16',  url => "http://search.cpan.org/~adamk/" },
-  { name => "Class::Accessor", version => '0.30',  url => "http://search.cpan.org/~kasei/" },
-  { name => "CGI::Ajax",       version => '0.697', url => "http://search.cpan.org/~bct/" },
-  { name => "DateTime",                            url => "http://search.cpan.org/~drolsky/" },
-  { name => "DBI",             version => '1.50',  url => "http://search.cpan.org/~timb/" },
-  { name => "DBD::Pg",         version => '1.49',  url => "http://search.cpan.org/~dbdpg/" },
-  { name => "Email::Address",                      url => "http://search.cpan.org/~rjbs/" },
-  { name => "FCGI",                                url => "http://search.cpan.org/~mstrout/" },
-  { name => "List::MoreUtils", version => '0.21',  url => "http://search.cpan.org/~vparseval/" },
-  { name => "PDF::API2",       version => '2.000', url => "http://search.cpan.org/~areibens/" },
-  { name => "Rose::Object",                        url => "http://search.cpan.org/~jsiracusa/" },
-  { name => "Rose::DB",                            url => "http://search.cpan.org/~jsiracusa/" },
-  { name => "Rose::DB::Object",                    url => "http://search.cpan.org/~jsiracusa/" },
-  { name => "Template",        version => '2.18',  url => "http://search.cpan.org/~abw/" },
-  { name => "Text::CSV_XS",    version => '0.23',  url => "http://search.cpan.org/~hmbrand/" },
-  { name => "Text::Iconv",     version => '1.2',   url => "http://search.cpan.org/~mpiotr/" },
-  { name => "URI",             version => '1.35',  url => "http://search.cpan.org/~gaas/" },
-  { name => "XML::Writer",     version => '0.602', url => "http://search.cpan.org/~josephw/" },
-  { name => "YAML",            version => '0.62',  url => "http://search.cpan.org/~ingy/" },
+  { name => "parent",                              url => "http://search.cpan.org/~corion/",    debian => 'libparent-perl' },
+  { name => "Archive::Zip",    version => '1.16',  url => "http://search.cpan.org/~adamk/",     debian => 'libarchive-zip-perl' },
+  { name => "Config::Std",                         url => "http://search.cpan.org/~dconway/",   debian => 'libconfig-std-perl' },
+  { name => "DateTime",                            url => "http://search.cpan.org/~drolsky/",   debian => 'libdatetime-perl' },
+  { name => "DBI",             version => '1.50',  url => "http://search.cpan.org/~timb/",      debian => 'libdbi-perl' },
+  { name => "DBD::Pg",         version => '1.49',  url => "http://search.cpan.org/~dbdpg/",     debian => 'libdbd-pg' },
+  { name => "Email::Address",                      url => "http://search.cpan.org/~rjbs/",      debian => 'libemail-address-perl' },
+  { name => "FCGI",                                url => "http://search.cpan.org/~mstrout/",   debian => 'libfcgi-perl' },
+  { name => "JSON",                                url => "http://search.cpan.org/~makamaka",   debian => 'libjson-perl' },
+  { name => "List::MoreUtils", version => '0.21',  url => "http://search.cpan.org/~vparseval/", debian => 'liblist-moreutils-perl' },
+  { name => "Params::Validate",                    url => "http://search.cpan.org/~drolsky/",   debian => 'libparams-validate-perl' },
+  { name => "PDF::API2",       version => '2.000', url => "http://search.cpan.org/~areibens/",  debian => 'libpdf-api2-perl' },
+  { name => "Rose::Object",                        url => "http://search.cpan.org/~jsiracusa/", debian => 'librose-object-perl' },
+  { name => "Rose::DB",                            url => "http://search.cpan.org/~jsiracusa/", debian => 'librose-db-perl' },
+  { name => "Rose::DB::Object",                    url => "http://search.cpan.org/~jsiracusa/", debian => 'librose-db-object-perl' },
+  { name => "String::ShellQuote", version => 1.01, url => "http://search.cpan.org/~rosch/",     debian => 'libstring-shellquote-perl' },
+  { name => "Sort::Naturally",                     url => "http://search.cpan.org/~sburke/",    debian => 'libsort-naturally-perl' },
+  { name => "Template",        version => '2.18',  url => "http://search.cpan.org/~abw/",       debian => 'libtemplate-perl' },
+  { name => "Text::CSV_XS",    version => '0.23',  url => "http://search.cpan.org/~hmbrand/",   debian => 'libtext-csv-xs-perl' },
+  { name => "Text::Iconv",     version => '1.2',   url => "http://search.cpan.org/~mpiotr/",    debian => 'libtext-iconv-perl' },
+  { name => "URI",             version => '1.35',  url => "http://search.cpan.org/~gaas/",      debian => 'liburi-perl' },
+  { name => "XML::Writer",     version => '0.602', url => "http://search.cpan.org/~josephw/",   debian => 'libxml-writer-perl' },
+  { name => "YAML",            version => '0.62',  url => "http://search.cpan.org/~ingy/",      debian => 'libyaml-perl' },
 );
 
 @optional_modules = ();
 
+@developer_modules = (
+  { name => "Devel::REPL",                         url => "http://search.cpan.org/~doy/",       debian => 'libdevel-repl-perl' },
+  { name => "Moose::Role",                         url => "http://search.cpan.org/~doy/",       debian => 'libmoose-role-perl' },
+  { name => "Perl::Tags",                          url => "http://search.cpan.org/~osfameron/", debian => 'libperl-tags-perl' },
+);
+
 $_->{fullname} = join ' ', grep $_, @$_{qw(name version)}
-  for @required_modules, @optional_modules;
+  for @required_modules, @optional_modules, @developer_modules;
+
 }
 
 sub module_available {
@@ -49,11 +59,8 @@ my %conditional_dependencies;
 sub check_for_conditional_dependencies {
   return if $conditional_dependencies{net_ldap}++;
 
-  my $self = {};
-  eval do { local (@ARGV, $/) = 'config/authentication.pl'; <> } or return;
-
   push @required_modules, { 'name' => 'Net::LDAP', 'url' => 'http://search.cpan.org/~gbarr/' }
-    if $self->{module} && ($self->{module} eq 'LDAP');
+    if $::lx_office_conf{authentication} && ($::lx_office_conf{authentication}->{module} eq 'LDAP');
 }
 
 sub test_all_modules {