X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=installer%2Finstall.pl;h=d9feac4b4373c634ac8b6cedf0758528938248dc;hb=4a9ea1c6328899a4c36c4ed6ac6f51d948f22230;hp=419273a684fcdf51756c8681be9bbb1a9f10b9dd;hpb=81cf767b17994c39dc83930305d4d9d65423db35;p=koha.git diff --git a/installer/install.pl b/installer/install.pl index 419273a684..d9feac4b43 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -185,7 +185,7 @@ 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(); @@ -312,6 +312,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);