From d742ea58f80ad01bddfc4cf4efa8af8aef2ae4cd Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 26 Jun 2017 11:27:37 +0100
Subject: [PATCH] Don't restore completion file
This could cause problems with upgrades
---
src/freedombone-restore-local | 56 +++++++++++++++++-----------------
src/freedombone-restore-remote | 52 +++++++++++++++----------------
2 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 87807ae60..78c0132a8 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -154,34 +154,34 @@ function restore_configfiles {
fi
fi
- if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
- cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
- fi
-
- if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
- cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
- if [ ! "$?" = "0" ]; then
- set_user_permissions
- backup_unmount_drive
- rm -rf $temp_restore_dir
- exit 5294
- fi
- fi
-
- if [ -f $CONFIGURATION_FILE ]; then
- # install according to the config file
- freedombone -c $CONFIGURATION_FILE
- fi
-
- if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
- cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
- if [ ! "$?" = "0" ]; then
- set_user_permissions
- backup_unmount_drive
- rm -rf $temp_restore_dir
- exit 6382
- fi
- fi
+ #if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
+ # cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
+ #fi
+
+ #if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
+ # cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
+ # if [ ! "$?" = "0" ]; then
+ # set_user_permissions
+ # backup_unmount_drive
+ # rm -rf $temp_restore_dir
+ # exit 5294
+ # fi
+ #fi
+
+ #if [ -f $CONFIGURATION_FILE ]; then
+ # # install according to the config file
+ # freedombone -c $CONFIGURATION_FILE
+ #fi
+
+ #if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
+ # cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
+ # if [ ! "$?" = "0" ]; then
+ # set_user_permissions
+ # backup_unmount_drive
+ # rm -rf $temp_restore_dir
+ # exit 6382
+ # fi
+ #fi
if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index 853cb7d3c..1bf97979d 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -144,32 +144,32 @@ function restore_configfiles {
fi
fi
- if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
- cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
- fi
-
- if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
- cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
- if [ ! "$?" = "0" ]; then
- unmount_drive
- rm -rf $temp_restore_dir
- exit 5372
- fi
- fi
-
- if [ -f $CONFIGURATION_FILE ]; then
- # install according to the config file
- freedombone -c $CONFIGURATION_FILE
- fi
-
- if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
- cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
- if [ ! "$?" = "0" ]; then
- unmount_drive
- rm -rf $temp_restore_dir
- exit 7252
- fi
- fi
+ #if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
+ # cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
+ #fi
+
+ #if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
+ # cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
+ # if [ ! "$?" = "0" ]; then
+ # unmount_drive
+ # rm -rf $temp_restore_dir
+ # exit 5372
+ # fi
+ #fi
+
+ #if [ -f $CONFIGURATION_FILE ]; then
+ # # install according to the config file
+ # freedombone -c $CONFIGURATION_FILE
+ #fi
+
+ #if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
+ # cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
+ # if [ ! "$?" = "0" ]; then
+ # unmount_drive
+ # rm -rf $temp_restore_dir
+ # exit 7252
+ # fi
+ #fi
if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
--
GitLab