ソースを参照

Don't restore completion file

This could cause problems with upgrades
Bob Mottram 7 年 前
コミット
d742ea58f8
共有2 個のファイルを変更した54 個の追加54 個の削除を含む
  1. 28
    28
      src/freedombone-restore-local
  2. 26
    26
      src/freedombone-restore-remote

+ 28
- 28
src/freedombone-restore-local ファイルの表示

@@ -154,34 +154,34 @@ function restore_configfiles {
154 154
             fi
155 155
         fi
156 156
 
157
-        if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
158
-            cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
159
-        fi
160
-
161
-        if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
162
-            cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
163
-            if [ ! "$?" = "0" ]; then
164
-                set_user_permissions
165
-                backup_unmount_drive
166
-                rm -rf $temp_restore_dir
167
-                exit 5294
168
-            fi
169
-        fi
170
-
171
-        if [ -f $CONFIGURATION_FILE ]; then
172
-            # install according to the config file
173
-            freedombone -c $CONFIGURATION_FILE
174
-        fi
175
-
176
-        if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
177
-            cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
178
-            if [ ! "$?" = "0" ]; then
179
-                set_user_permissions
180
-                backup_unmount_drive
181
-                rm -rf $temp_restore_dir
182
-                exit 6382
183
-            fi
184
-        fi
157
+        #if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
158
+        #    cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
159
+        #fi
160
+
161
+        #if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
162
+        #    cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
163
+        #    if [ ! "$?" = "0" ]; then
164
+        #        set_user_permissions
165
+        #        backup_unmount_drive
166
+        #        rm -rf $temp_restore_dir
167
+        #        exit 5294
168
+        #    fi
169
+        #fi
170
+
171
+        #if [ -f $CONFIGURATION_FILE ]; then
172
+        #    # install according to the config file
173
+        #    freedombone -c $CONFIGURATION_FILE
174
+        #fi
175
+
176
+        #if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
177
+        #    cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
178
+        #    if [ ! "$?" = "0" ]; then
179
+        #        set_user_permissions
180
+        #        backup_unmount_drive
181
+        #        rm -rf $temp_restore_dir
182
+        #        exit 6382
183
+        #    fi
184
+        #fi
185 185
 
186 186
         if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
187 187
             cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}

+ 26
- 26
src/freedombone-restore-remote ファイルの表示

@@ -144,32 +144,32 @@ function restore_configfiles {
144 144
             fi
145 145
         fi
146 146
 
147
-        if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
148
-            cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
149
-        fi
150
-
151
-        if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
152
-            cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
153
-            if [ ! "$?" = "0" ]; then
154
-                unmount_drive
155
-                rm -rf $temp_restore_dir
156
-                exit 5372
157
-            fi
158
-        fi
159
-
160
-        if [ -f $CONFIGURATION_FILE ]; then
161
-            # install according to the config file
162
-            freedombone -c $CONFIGURATION_FILE
163
-        fi
164
-
165
-        if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
166
-            cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
167
-            if [ ! "$?" = "0" ]; then
168
-                unmount_drive
169
-                rm -rf $temp_restore_dir
170
-                exit 7252
171
-            fi
172
-        fi
147
+        #if [ -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE ]; then
148
+        #    cp -f $temp_restore_dir$NODEJS_INSTALLED_APPS_FILE $NODEJS_INSTALLED_APPS_FILE
149
+        #fi
150
+
151
+        #if [ -f $temp_restore_dir/root/${PROJECT_NAME}.cfg ]; then
152
+        #    cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIGURATION_FILE
153
+        #    if [ ! "$?" = "0" ]; then
154
+        #        unmount_drive
155
+        #        rm -rf $temp_restore_dir
156
+        #        exit 5372
157
+        #    fi
158
+        #fi
159
+
160
+        #if [ -f $CONFIGURATION_FILE ]; then
161
+        #    # install according to the config file
162
+        #    freedombone -c $CONFIGURATION_FILE
163
+        #fi
164
+
165
+        #if [ -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt ]; then
166
+        #    cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
167
+        #    if [ ! "$?" = "0" ]; then
168
+        #        unmount_drive
169
+        #        rm -rf $temp_restore_dir
170
+        #        exit 7252
171
+        #    fi
172
+        #fi
173 173
 
174 174
         if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
175 175
             cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}