Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1312

Show
Ignore:
Timestamp:
08/07/08 08:34:32 (4 months ago)
Author:
rats
Message:

fixed a lot of issues found in RC6 release

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/engine/setup/ispcp-update

    r1307 r1312  
    314314    print STDOUT "\tCopying database..."; 
    315315 
    316     if (sys_command("mysqldump --opt -u\"$main::db_user\" -p\"$main::db_pwd\" $main::vhcs2{'DATABASE_NAME'} | mysql -u\"$main::db_user\" -p\"$main::db_pwd\" $main::db_name") != 0) { 
     316    if (sys_command("$main::cfg{'CMD_MYSQLDUMP'} --opt -u\"$main::db_user\" -p\"$main::db_pwd\" $main::vhcs2{'DATABASE_NAME'} | $main::cfg{'CMD_MYSQL'} -u\"$main::db_user\" -p\"$main::db_pwd\" $main::db_name") != 0) { 
    317317        print STDOUT "failed!\n"; 
    318318        exit_werror(); 
    …… 
    338338        return $rs if ($rs != 0); 
    339339 
    340         $rs = sys_command("mysql -u\"$main::db_user\" -p\"$main::db_pwd\" < /tmp/db.sql"); 
     340        $rs = sys_command("$main::cfg{'CMD_MYSQL'} -u\"$main::db_user\" -p\"$main::db_pwd\" < /tmp/db.sql"); 
    341341        if ($rs != 0) { 
    342342        print STDOUT "failed!\n"; 
    …… 
    837837        return $rs if ($rs != 0); 
    838838 
    839         $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql"); 
     839        $main::db_pwd =~ s/([\'\"])/\\$1/g; 
     840        $rs = sys_command("$main::cfg{'CMD_MYSQL'} -u\"$main::db_user\" -p\"$main::db_pwd\" < /tmp/db.sql"); 
    840841        if ($rs != 0) { 
    841842                exit_werror("SQL Update failed."); 
    …… 
    885886        return $rs if ($rs != 0); 
    886887 
    887         $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql"); 
     888        $main::db_pwd =~ s/([\'\"])/\\$1/g; 
     889        $rs = sys_command("$main::cfg{'CMD_MYSQL'} -u\"$main::db_user\" -p\"$main::db_pwd\" < /tmp/db.sql"); 
    888890        if ($rs != 0) { 
    889891        print STDOUT "failed!\n"; 
    …… 
    933935 
    934936        if ($main::cfg{'ISPCP_SUPPORT_SYSTEM_PATH'} == support_system.php) { 
    935                 $rs = set_conf_val('ISPCP_SUPPORT_SYSTEM_PATH', ticket_system.php); 
     937                my $rs = set_conf_val('ISPCP_SUPPORT_SYSTEM_PATH', ticket_system.php); 
    936938                return $rs if ($rs != 0); 
    937939        }