Browse Source

FIX for 1298 : removing hardcoded calls to mySQL, Perl, zebra & yaz-client

Signed-off-by: Chris Cormack <crc@liblime.com>
3.0.x
Paul POULAIN 17 years ago
committed by Chris Cormack
parent
commit
fd10552848
  1. 43
      installer/install.pl
  2. 16
      koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl

43
installer/install.pl

@ -54,9 +54,6 @@ if ( $step && $step == 1 ) {
#First Step
#Checking ALL perl Modules and services needed are installed.
#Whenever there is an error, adding a report to the page
# I suppose here that Apache user can access /usr/bin/
# If mysql or zebra are in some fancy directory not in PATH
# Performing a disk search.
$template->param( language => 1 );
my $problem;
@ -64,46 +61,6 @@ if ( $step && $step == 1 ) {
$template->param( "problems" => 1, "perlversion" => 1 );
$problem = 1;
}
unless ( -x "/usr/bin/perl" ) {
my $realperl = `which perl`;
$realperl = `find / -name perl` unless ($realperl);
chomp $realperl;
$template->param( "problems" => 1, 'perllocation' => 1 )
unless ($realperl);
$problem = 1 unless ($realperl);
}
unless ( -x "/usr/local/bin/mysql" ) {
my $mysql = `which mysql`;
$mysql = `find / -name mysql` unless ($mysql);
chomp $mysql;
$template->param( "problems" => 1, 'mysql' => 1 ) unless ($mysql);
$problem = 1 unless ($mysql);
}
unless ( -x "/usr/local/bin/zebraidx" || -x "/usr/local/bin/zebraidx-2.0" )
{
my $zebra = `which zebraidx`;
$zebra = `which zebraidx-2.0` unless ($zebra);
$zebra = `find / -name "zebraidx*"` unless ($zebra);
chomp $zebra;
$template->param( "problems" => 1, 'zebra' => 1 ) unless ($zebra);
$problem = 1 unless ($zebra);
}
unless ( -x "/usr/local/bin/zebrasrv" || -x "/usr/local/bin/zebrasrv-2.0" )
{
my $zebra = `which zebrasrv`;
$zebra = `which zebrasrv-2.0` unless ($zebra);
$zebra = `find / -name "zebrasrv*"` unless ($zebra);
chomp $zebra;
$template->param( "problems" => 1, 'zebra' => 1 ) unless ($zebra);
$problem = 1 unless ($zebra);
}
unless ( -x "/usr/local/bin/yaz-client" ) {
my $yaz = `which yaz-client`;
$yaz = `find / -name "yaz-client*"` unless ($yaz);
chomp $yaz;
$template->param( "problems" => 1, 'yaz' => 1 ) unless ($yaz);
$problem = 1 unless ($yaz);
}
# We could here use a special find
my @missing = ();

16
koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl

@ -56,22 +56,6 @@ listed, please inform your systems administrator.</p>
<li>Your perl version seems to be obsolete.
Please upgrade to a newer version of Perl (at least Version 5.006001).</li>
<!--/TMPL_IF-->
<!--TMPL_IF Name="perllocation"-->
<li>Your perl installation is not in /usr/bin/.
This version of the Web Installer expects perl to be in /usr/bin/.</li>
<!--/TMPL_IF-->
<!--TMPL_IF Name="zebra"-->
<li>Zebra server doesn't seem to be installed or I can't find it.
Please install it before continuing.</li>
<!--/TMPL_IF-->
<!--TMPL_IF Name="mysql"-->
<li>MySQL server doesn't seem to be installed or I can't find it.
Please install it before continuing.</li>
<!--/TMPL_IF-->
<!--TMPL_IF Name="yaz"-->
<li>Yaz doesn't seem to be installed or I can't find it.
Please install it before continuing.</li>
<!--/TMPL_IF-->
</ul>
<!--/TMPL_IF-->
<!--/TMPL_UNLESS-->

Loading…
Cancel
Save