瀏覽代碼

Avoid getting stuck with old backups

Bob Mottram 8 年之前
父節點
當前提交
b90ce42209
共有 2 個檔案被更改,包括 6 行新增6 行删除
  1. 3
    3
      src/freedombone-app-dokuwiki
  2. 3
    3
      src/freedombone-app-htmly

+ 3
- 3
src/freedombone-app-dokuwiki 查看文件

93
         DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
93
         DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
94
         temp_restore_dir=/root/tempdokuwiki
94
         temp_restore_dir=/root/tempdokuwiki
95
         function_check restore_directory_from_usb
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
             restore_directory_from_usb ${temp_restore_dir} dokuwiki
97
             restore_directory_from_usb ${temp_restore_dir} dokuwiki
98
+        else
99
+            restore_directory_from_usb ${temp_restore_dir} wiki
100
         fi
100
         fi
101
         cp -r ${temp_restore_dir}/var/lib/dokuwiki/* /var/lib/dokuwiki/
101
         cp -r ${temp_restore_dir}/var/lib/dokuwiki/* /var/lib/dokuwiki/
102
         if [ ! "$?" = "0" ]; then
102
         if [ ! "$?" = "0" ]; then

+ 3
- 3
src/freedombone-app-htmly 查看文件

226
     if [ $HTMLY_DOMAIN_NAME ]; then
226
     if [ $HTMLY_DOMAIN_NAME ]; then
227
         echo $"Restoring htmly installation"
227
         echo $"Restoring htmly installation"
228
         temp_restore_dir=/root/temphtmly
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
             restore_directory_from_usb $temp_restore_dir htmly
230
             restore_directory_from_usb $temp_restore_dir htmly
231
+        else
232
+            restore_directory_from_usb $temp_restore_dir blog
233
         fi
233
         fi
234
         if [ -d /var/www/${HTMLY_DOMAIN_NAME}/htdocs ]; then
234
         if [ -d /var/www/${HTMLY_DOMAIN_NAME}/htdocs ]; then
235
             rm -rf /var/www/${HTMLY_DOMAIN_NAME}/htdocs
235
             rm -rf /var/www/${HTMLY_DOMAIN_NAME}/htdocs