浏览代码

Restoring individual apps

Bob Mottram 8 年前
父节点
当前提交
1764a32911
共有 2 个文件被更改,包括 19 次插入8 次删除
  1. 2
    2
      src/freedombone-restore-local
  2. 17
    6
      src/freedombone-utils-backup

+ 2
- 2
src/freedombone-restore-local 查看文件

101
 
101
 
102
 function restore_configuration {
102
 function restore_configuration {
103
     if [[ $RESTORE_APP != 'all' ]]; then
103
     if [[ $RESTORE_APP != 'all' ]]; then
104
-        if [[ $RESTORE_APP != 'configuration' ]]; then
104
+        if [[ $RESTORE_APP != 'config' ]]; then
105
             return
105
             return
106
         fi
106
         fi
107
     fi
107
     fi
715
 restore_personal_settings
715
 restore_personal_settings
716
 restore_mailing_list
716
 restore_mailing_list
717
 restore_email
717
 restore_email
718
-restore_apps local
718
+restore_apps local $RESTORE_APP
719
 set_user_permissions
719
 set_user_permissions
720
 backup_unmount_drive
720
 backup_unmount_drive
721
 
721
 

+ 17
- 6
src/freedombone-utils-backup 查看文件

388
 
388
 
389
 function restore_apps {
389
 function restore_apps {
390
     localremote=$1
390
     localremote=$1
391
+    RESTORE_APP=$2
391
 
392
 
392
     RESTORE_APPS_COMPLETED=()
393
     RESTORE_APPS_COMPLETED=()
393
 
394
 
396
 
397
 
397
     for app_name in "${APPS_INSTALLED_NAMES[@]}"
398
     for app_name in "${APPS_INSTALLED_NAMES[@]}"
398
     do
399
     do
399
-        echo $"Restoring ${app_name}"
400
-        app_load_variables ${app_name}
401
-        function_check restore_${localremote}_${app_name}
402
-        restore_${localremote}_${app_name}
403
-        RESTORE_APPS_COMPLETED+=("${app_name}")
404
-        echo $"Restored ${app_name}"
400
+        confirm_restore=
401
+        if [ ! $2 ]; then
402
+            confirm_restore=1
403
+        else
404
+            if [[ "$RESTORE_APP" == "$app_name" ]]; then
405
+                confirm_restore=1
406
+            fi
407
+        fi
408
+        if [ $confirm_restore ]; then
409
+            echo $"Restoring ${app_name}"
410
+            app_load_variables ${app_name}
411
+            function_check restore_${localremote}_${app_name}
412
+            restore_${localremote}_${app_name}
413
+            RESTORE_APPS_COMPLETED+=("${app_name}")
414
+            echo $"Restored ${app_name}"
415
+        fi
405
     done
416
     done
406
 }
417
 }
407
 
418