X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=installer%2Finstall.pl;h=389dabd3b6ae858836d7d7aea317212e67e42f18;hb=68229cbbcd0fdd93a9c4cc2517b961d0f1cd5890;hp=ae478b60a6d1cedd5ca4245a032b56729f34a970;hpb=af205cb50af430b743fccd84475be15ce14fc84e;p=koha_fer

diff --git a/installer/install.pl b/installer/install.pl
index ae478b60a6..389dabd3b6 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use diagnostics;
 
-use InstallAuth;
+use C4::InstallAuth;
 use CGI;
 use IPC::Cmd;
 
@@ -59,7 +59,7 @@ if ( $step && $step == 1 ) {
     $template->param( language => 1 );
     $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
 
-    unless ( $] >= 5.008008 ) {    # Bug 4505
+    unless ( $] >= 5.010000 ) {    # Bug 7375
         $template->param( problems => 1, perlversion => 1, checkmodule => 0 );
     }
 
@@ -185,11 +185,10 @@ elsif ( $step && $step == 3 ) {
         # we have finished, just redirect to mainpage.
         #
         print $query->redirect("/cgi-bin/koha/mainpage.pl");
-        exit 1;
+        exit;
     }
     elsif ( $op && $op eq 'finish' ) {
         $installer->set_version_syspref();
-        $installer->set_indexing_engine(0); # use Zebra
 
         # Installation is finished.
         # We just deny anybody access to install
@@ -242,7 +241,7 @@ elsif ( $step && $step == 3 ) {
         $template->param( "frameworksloop" => $fwklist );
         $template->param( "marcflavour" => ucfirst($marcflavour));
 
-        my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice, $marcflavour);
+        my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice);
         $template->param( "en_sample_data" => $sample_defaulted_to_en);
         $template->param( "levelloop" => $levellist );
         $template->param( "$op"       => 1 );
@@ -312,6 +311,15 @@ elsif ( $step && $step == 3 ) {
         # Not 1st install, the only sub-step : update database
         #
         #Do updatedatabase And report
+
+    if ( ! defined $ENV{PERL5LIB} ) {
+        my $find = "C4/Context.pm";
+        my $path = $INC{$find};
+        $path =~ s/\Q$find\E//;
+        $ENV{PERL5LIB} = "$path:$path/installer";
+        warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";
+    }
+
         my $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl";
         my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) = IPC::Cmd::run(command => $cmd, verbose => 0);
 
@@ -330,7 +338,7 @@ elsif ( $step && $step == 3 ) {
     }
     else {
         #
-        # check wether it's a 1st install or an update
+        # check whether it's a 1st install or an update
         #
         #Check if there are enough tables.
         # Paul has cleaned up tables so reduced the count
@@ -374,8 +382,6 @@ elsif ( $step && $step == 3 ) {
                                 );
             }
         }
-
-        $dbh->disconnect;
     }
 }
 else {
@@ -391,8 +397,8 @@ else {
         if ( $rq->execute ) {
             my ($version) = $rq->fetchrow;
             if ($version) {
-                $query->redirect("install.pl?step=3");
-				exit;
+                print $query->redirect("/cgi-bin/koha/installer/install.pl?step=3");
+                exit;
             }
         }
     }