Check files

This commit is contained in:
Bob Mottram 2016-10-20 17:24:23 +01:00
parent dde8e0fcf3
commit 7f970fe02c
2 changed files with 32 additions and 22 deletions

View File

@ -112,6 +112,7 @@ function restore_configuration {
temp_restore_dir=/root/tempconfig temp_restore_dir=/root/tempconfig
restore_directory_from_usb $temp_restore_dir config restore_directory_from_usb $temp_restore_dir config
if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
set_user_permissions set_user_permissions
@ -119,11 +120,14 @@ function restore_configuration {
rm -rf $temp_restore_dir rm -rf $temp_restore_dir
exit 5294 exit 5294
fi fi
fi
if [ -f $CONFIGURATION_FILE ]; then if [ -f $CONFIGURATION_FILE ]; then
# install according to the config file # install according to the config file
freedombone -c $CONFIGURATION_FILE freedombone -c $CONFIGURATION_FILE
fi fi
if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
set_user_permissions set_user_permissions
@ -131,6 +135,7 @@ function restore_configuration {
rm -rf $temp_restore_dir rm -rf $temp_restore_dir
exit 6382 exit 6382
fi fi
fi
if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES} cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}

View File

@ -119,23 +119,28 @@ function restore_configuration {
temp_restore_dir=/root/tempconfig temp_restore_dir=/root/tempconfig
restore_directory_from_friend $temp_restore_dir config restore_directory_from_friend $temp_restore_dir config
if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
unmount_drive unmount_drive
rm -rf $temp_restore_dir rm -rf $temp_restore_dir
exit 5372 exit 5372
fi fi
fi
if [ -f $CONFIGURATION_FILE ]; then if [ -f $CONFIGURATION_FILE ]; then
# install according to the config file # install according to the config file
freedombone -c $CONFIGURATION_FILE freedombone -c $CONFIGURATION_FILE
fi fi
if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
unmount_drive unmount_drive
rm -rf $temp_restore_dir rm -rf $temp_restore_dir
exit 7252 exit 7252
fi fi
fi
if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES} cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}