浏览代码

Fixing ttrss backup and restore

Bob Mottram 7 年前
父节点
当前提交
48a8db2053
共有 1 个文件被更改,包括 5 次插入6 次删除
  1. 5
    6
      src/freedombone-app-rss

+ 5
- 6
src/freedombone-app-rss 查看文件

149
 
149
 
150
 function backup_local_rss {
150
 function backup_local_rss {
151
     if [ -d /etc/share/tt-rss ]; then
151
     if [ -d /etc/share/tt-rss ]; then
152
-        RSS_READER_DOMAIN_NAME=$(get_completion_param "rss reader domain")
153
-
154
         echo $"Backing up ttrss"
152
         echo $"Backing up ttrss"
155
 
153
 
156
         function_check backup_database_to_usb
154
         function_check backup_database_to_usb
168
     function_check rss_create_database
166
     function_check rss_create_database
169
     rss_create_database
167
     rss_create_database
170
 
168
 
171
-    restore_database ttrss ${RSS_READER_DOMAIN_NAME}
169
+    restore_database ttrss
172
 
170
 
173
     if [ -d /etc/share/tt-rss ]; then
171
     if [ -d /etc/share/tt-rss ]; then
174
         if [ -d $temp_restore_dir/etc/share/tt-rss ]; then
172
         if [ -d $temp_restore_dir/etc/share/tt-rss ]; then
219
 function backup_remote_rss {
217
 function backup_remote_rss {
220
     if [ -d /etc/share/tt-rss ]; then
218
     if [ -d /etc/share/tt-rss ]; then
221
         function_check suspend_site
219
         function_check suspend_site
222
-        suspend_site ${RSS_READER_DOMAIN_NAME}
220
+        suspend_site ttrss
223
 
221
 
224
         function_check backup_database_to_friend
222
         function_check backup_database_to_friend
225
         backup_database_to_friend ttrss
223
         backup_database_to_friend ttrss
232
         function_check restart_site
230
         function_check restart_site
233
         restart_site
231
         restart_site
234
     else
232
     else
235
-        echo $"RSS reader domain specified but not found in /etc/share/ttrss}"
233
+        echo $"/etc/share/tt-rss directory not found}"
234
+        exit 783532
236
     fi
235
     fi
237
 }
236
 }
238
 
237
 
245
         function_check rss_create_database
244
         function_check rss_create_database
246
         rss_create_database
245
         rss_create_database
247
 
246
 
248
-        restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME}
247
+        restore_database_from_friend ttrss
249
 
248
 
250
         if [ -d /etc/share/tt-rss ]; then
249
         if [ -d /etc/share/tt-rss ]; then
251
             if [ -d $temp_restore_dir/etc/share/tt-rss ]; then
250
             if [ -d $temp_restore_dir/etc/share/tt-rss ]; then