Lines 505-512
sub load_sql {
Link Here
|
505 |
my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}"; |
505 |
my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}"; |
506 |
my $error; |
506 |
my $error; |
507 |
my $strcmd; |
507 |
my $strcmd; |
|
|
508 |
my $cmd; |
508 |
if ( $self->{dbms} eq 'mysql' ) { |
509 |
if ( $self->{dbms} eq 'mysql' ) { |
509 |
$strcmd = "mysql " |
510 |
$cmd = qx(which mysql 2>/dev/null || whereis mysql 2>/dev/null); |
|
|
511 |
chomp $cmd; |
512 |
$cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/); |
513 |
$cmd = 'mysql' if (!$cmd || !-x $cmd); |
514 |
$strcmd = "$cmd " |
510 |
. ( $self->{hostname} ? " -h $self->{hostname} " : "" ) |
515 |
. ( $self->{hostname} ? " -h $self->{hostname} " : "" ) |
511 |
. ( $self->{port} ? " -P $self->{port} " : "" ) |
516 |
. ( $self->{port} ? " -P $self->{port} " : "" ) |
512 |
. ( $self->{user} ? " -u $self->{user} " : "" ) |
517 |
. ( $self->{user} ? " -u $self->{user} " : "" ) |
Lines 514-520
sub load_sql {
Link Here
|
514 |
. " $self->{dbname} "; |
519 |
. " $self->{dbname} "; |
515 |
$error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null); |
520 |
$error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null); |
516 |
} elsif ( $self->{dbms} eq 'Pg' ) { |
521 |
} elsif ( $self->{dbms} eq 'Pg' ) { |
517 |
$strcmd = "psql " |
522 |
$cmd = qx(which psql 2>/dev/null || whereis psql 2>/dev/null); |
|
|
523 |
chomp $cmd; |
524 |
$cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/); |
525 |
$cmd = 'psql' if (!$cmd || !-x $cmd); |
526 |
$strcmd = "$cmd " |
518 |
. ( $self->{hostname} ? " -h $self->{hostname} " : "" ) |
527 |
. ( $self->{hostname} ? " -h $self->{hostname} " : "" ) |
519 |
. ( $self->{port} ? " -p $self->{port} " : "" ) |
528 |
. ( $self->{port} ? " -p $self->{port} " : "" ) |
520 |
. ( $self->{user} ? " -U $self->{user} " : "" ) |
529 |
. ( $self->{user} ? " -U $self->{user} " : "" ) |
521 |
- |
|
|