projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 9587 Follow up to fix the problem Katrin identified
[koha_fer]
/
C4
/
Installer.pm
diff --git
a/C4/Installer.pm
b/C4/Installer.pm
index
a7eb1f6
..
304698e
100644
(file)
--- a/
C4/Installer.pm
+++ b/
C4/Installer.pm
@@
-20,9
+20,9
@@
package C4::Installer;
use strict;
#use warnings; FIXME - Bug 2505
use strict;
#use warnings; FIXME - Bug 2505
-our $VERSION = 3.0
0
;
+our $VERSION = 3.0
7.00.049
;
use C4::Context;
use C4::Context;
-use C4::Installer::PerlModules
1.000000
;
+use C4::Installer::PerlModules;
=head1 NAME
=head1 NAME
@@
-154,8
+154,8
@@
sub marc_framework_sql_list {
my @frameworklist;
map {
my $name = substr( $_, 0, -4 );
my @frameworklist;
map {
my $name = substr( $_, 0, -4 );
- open
FILE, "<:utf8",
"$dir/$requirelevel/$name.txt";
- my $lines = <
FILE
>;
+ open
my $fh, "<:encoding(UTF-8)",
"$dir/$requirelevel/$name.txt";
+ my $lines = <
$fh
>;
$lines =~ s/\n|\r/<br \/>/g;
use utf8;
utf8::encode($lines) unless ( utf8::is_utf8($lines) );
$lines =~ s/\n|\r/<br \/>/g;
use utf8;
utf8::encode($lines) unless ( utf8::is_utf8($lines) );
@@
-232,8
+232,8
@@
sub sample_data_sql_list {
my @frameworklist;
map {
my $name = substr( $_, 0, -4 );
my @frameworklist;
map {
my $name = substr( $_, 0, -4 );
- open
FILE, "<:utf8",
"$dir/$requirelevel/$name.txt";
- my $lines = <
FILE
>;
+ open
my $fh , "<:encoding(UTF-8)",
"$dir/$requirelevel/$name.txt";
+ my $lines = <
$fh
>;
$lines =~ s/\n|\r/<br \/>/g;
use utf8;
utf8::encode($lines) unless ( utf8::is_utf8($lines) );
$lines =~ s/\n|\r/<br \/>/g;
use utf8;
utf8::encode($lines) unless ( utf8::is_utf8($lines) );
@@
-508,8
+508,13
@@
sub load_sql {
my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}";
my $error;
my $strcmd;
my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}";
my $error;
my $strcmd;
+ my $cmd;
if ( $self->{dbms} eq 'mysql' ) {
if ( $self->{dbms} eq 'mysql' ) {
- $strcmd = "mysql "
+ $cmd = qx(which mysql 2>/dev/null || whereis mysql 2>/dev/null);
+ chomp $cmd;
+ $cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/);
+ $cmd = 'mysql' if (!$cmd || !-x $cmd);
+ $strcmd = "$cmd "
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -P $self->{port} " : "" )
. ( $self->{user} ? " -u $self->{user} " : "" )
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -P $self->{port} " : "" )
. ( $self->{user} ? " -u $self->{user} " : "" )
@@
-517,7
+522,11
@@
sub load_sql {
. " $self->{dbname} ";
$error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null);
} elsif ( $self->{dbms} eq 'Pg' ) {
. " $self->{dbname} ";
$error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null);
} elsif ( $self->{dbms} eq 'Pg' ) {
- $strcmd = "psql "
+ $cmd = qx(which psql 2>/dev/null || whereis psql 2>/dev/null);
+ chomp $cmd;
+ $cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/);
+ $cmd = 'psql' if (!$cmd || !-x $cmd);
+ $strcmd = "$cmd "
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -p $self->{port} " : "" )
. ( $self->{user} ? " -U $self->{user} " : "" )
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -p $self->{port} " : "" )
. ( $self->{user} ? " -U $self->{user} " : "" )