View | Details | Raw Unified | Return to bug 6008
Collapse All | Expand All

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

Return to bug 6008