|
@@ -544,17 +544,17 @@ function restore_database {
|
544
|
544
|
echo $"Restoring ${restore_app_name} database"
|
545
|
545
|
local_database_dir=/root/temp${restore_app_name}data
|
546
|
546
|
function_check restore_directory_from_usb
|
547
|
|
- restore_directory_from_usb "${local_database}" "${restore_app_name}data"
|
|
547
|
+ restore_directory_from_usb "${local_database_dir}" "${restore_app_name}data"
|
548
|
548
|
if [ ! -f /root/temp${restore_app_name}data/${RESTORE_SUBDIR}/temp${restore_app_name}data/${restore_app_name}.sql ]; then
|
549
|
549
|
echo $"Unable to restore ${restore_app_name} database"
|
550
|
|
- rm -rf ${local_database}
|
|
550
|
+ rm -rf ${local_database_dir}
|
551
|
551
|
function_check set_user_permissions
|
552
|
552
|
set_user_permissions
|
553
|
553
|
function_check backup_unmount_drive
|
554
|
554
|
backup_unmount_drive
|
555
|
555
|
exit 503
|
556
|
556
|
fi
|
557
|
|
- mysqlsuccess=$(mysql -u root --password="$DATABASE_PASSWORD" ${restore_app_name} -o < ${local_database}/${RESTORE_SUBDIR}/temp${restore_app_name}data/${restore_app_name}.sql)
|
|
557
|
+ mysqlsuccess=$(mysql -u root --password="$DATABASE_PASSWORD" ${restore_app_name} -o < ${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data/${restore_app_name}.sql)
|
558
|
558
|
if [ ! "$?" = "0" ]; then
|
559
|
559
|
echo "$mysqlsuccess"
|
560
|
560
|
function_check set_user_permissions
|
|
@@ -563,8 +563,8 @@ function restore_database {
|
563
|
563
|
backup_unmount_drive
|
564
|
564
|
exit 964
|
565
|
565
|
fi
|
566
|
|
- shred -zu ${local_database}/${RESTORE_SUBDIR}/temp${restore_app_name}data/*
|
567
|
|
- rm -rf ${local_database}
|
|
566
|
+ shred -zu ${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data/*
|
|
567
|
+ rm -rf ${local_database_dir}
|
568
|
568
|
echo $"Restoring ${restore_app_name} installation"
|
569
|
569
|
if [ ! -d /root/temp${restore_app_name} ]; then
|
570
|
570
|
mkdir /root/temp${restore_app_name}
|