X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1e768ce8b2a4316532896bbd8068aa84b0729829..ab7c51c13324db5af2f7c6a3856f41f742c6c8d6:/scripts/installation_check.pl diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl index 47be40d64..fa6083839 100755 --- a/scripts/installation_check.pl +++ b/scripts/installation_check.pl @@ -6,7 +6,6 @@ BEGIN { unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML). push (@INC, $FindBin::Bin . '/..'); # '.' will be removed from @INC soon. - push (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version. # this is a default dir. may be wrong in your installation, change it then $master_templates = $FindBin::Bin . '/../templates/print/'; @@ -179,10 +178,10 @@ sub kpsewhich { $package =~ s/[^-_0-9A-Za-z]//g; my $type_desc = $type eq 'cls' ? 'document class' : 'package'; - eval { use String::ShellQuote; 1 } or warn "can't load String::ShellQuote" && return; - $dw = shell_quote $dw; - my $e_package = shell_quote $package; - my $e_type = shell_quote $type; + eval { require String::ShellQuote; 1 } or warn "can't load String::ShellQuote" && return; + $dw = String::ShellQuote::shell_quote $dw; + my $e_package = String::ShellQuote::shell_quote $package; + my $e_type = String::ShellQuote::shell_quote $type; my $exit = system(qq|TEXINPUTS=".:$dw:" kpsewhich $e_package.$e_type > /dev/null|); my $res = $exit > 0 ? 0 : 1; @@ -212,7 +211,7 @@ sub check_pdfinfo { print_line($line, $ver_string, 'green'); } else { print_line($line, 'not installed','red'); - my %modinfo = ( name => 'pdfinfo' ); + my %modinfo = ( debian => 'poppler-utils' ); push @missing_modules, \%modinfo; }