HTML::Template => HTML::Template::Pro

[koha.git] / installer / install.pl

diff --git a/installer/install.pl b/installer/install.pl
index 3f4ef7e..21ec5d8 100755 (executable)
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -87,10 +87,10 @@ if ( $step && $step == 1 ) {
     unless ( eval { require DBD::mysql } ) {
         push @missing, { name => "DBD::mysql" };
     }
-    unless ( eval { require HTML::Template } ) {
+    unless ( eval { require HTML::Template::Pro } ) {
         push @missing, { name => "HTML::Template::Pro" };
     }
-    unless ( eval { require HTML::Template } ) {
+    unless ( eval { require Date::Calc } ) {
         push @missing, { name => "Date::Calc" };
     }
     unless ( eval { require Digest::MD5 } ) {
@@ -596,7 +596,7 @@ elsif ( $step && $step == 3 ) {
         #
         #Do updatedatabase And report
         my $execstring =
-          C4::Context->config("intranetdir") . "/installer/updatedatabase.pl";
+          C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl";
         undef $/;
         my $string = qx($execstring 2>&1 1>/dev/null);                         # added '1>/dev/null' to return only stderr in $string. Needs testing here. -fbcit
         if ($string) {