Browse Source

Avoid getting stuck with old backups

Bob Mottram 8 years ago
parent
commit
b90ce42209
2 changed files with 6 additions and 6 deletions
  1. 3
    3
      src/freedombone-app-dokuwiki
  2. 3
    3
      src/freedombone-app-htmly

+ 3
- 3
src/freedombone-app-dokuwiki View File

@@ -93,10 +93,10 @@ function restore_local_dokuwiki {
93 93
         DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
94 94
         temp_restore_dir=/root/tempdokuwiki
95 95
         function_check restore_directory_from_usb
96
-        if [ -d ${USB_MOUNT}/backup/wiki ]; then
97
-            restore_directory_from_usb ${temp_restore_dir} wiki
98
-        else
96
+        if [ -d ${USB_MOUNT}/backup/dokuwiki ]; then
99 97
             restore_directory_from_usb ${temp_restore_dir} dokuwiki
98
+        else
99
+            restore_directory_from_usb ${temp_restore_dir} wiki
100 100
         fi
101 101
         cp -r ${temp_restore_dir}/var/lib/dokuwiki/* /var/lib/dokuwiki/
102 102
         if [ ! "$?" = "0" ]; then

+ 3
- 3
src/freedombone-app-htmly View File

@@ -226,10 +226,10 @@ function restore_local_htmly {
226 226
     if [ $HTMLY_DOMAIN_NAME ]; then
227 227
         echo $"Restoring htmly installation"
228 228
         temp_restore_dir=/root/temphtmly
229
-        if [ -d $USB_MOUNT/backup/blog ]; then
230
-            restore_directory_from_usb $temp_restore_dir blog
231
-        else
229
+        if [ -d $USB_MOUNT/backup/htmly ]; then
232 230
             restore_directory_from_usb $temp_restore_dir htmly
231
+        else
232
+            restore_directory_from_usb $temp_restore_dir blog
233 233
         fi
234 234
         if [ -d /var/www/${HTMLY_DOMAIN_NAME}/htdocs ]; then
235 235
             rm -rf /var/www/${HTMLY_DOMAIN_NAME}/htdocs