Explorar el Código

Fixing ttrss backup and restore

Bob Mottram hace 7 años
padre
commit
48a8db2053
Se han modificado 1 ficheros con 5 adiciones y 6 borrados
  1. 5
    6
      src/freedombone-app-rss

+ 5
- 6
src/freedombone-app-rss Ver fichero

@@ -149,8 +149,6 @@ function upgrade_rss {
149 149
 
150 150
 function backup_local_rss {
151 151
     if [ -d /etc/share/tt-rss ]; then
152
-        RSS_READER_DOMAIN_NAME=$(get_completion_param "rss reader domain")
153
-
154 152
         echo $"Backing up ttrss"
155 153
 
156 154
         function_check backup_database_to_usb
@@ -168,7 +166,7 @@ function restore_local_rss {
168 166
     function_check rss_create_database
169 167
     rss_create_database
170 168
 
171
-    restore_database ttrss ${RSS_READER_DOMAIN_NAME}
169
+    restore_database ttrss
172 170
 
173 171
     if [ -d /etc/share/tt-rss ]; then
174 172
         if [ -d $temp_restore_dir/etc/share/tt-rss ]; then
@@ -219,7 +217,7 @@ function restore_local_rss {
219 217
 function backup_remote_rss {
220 218
     if [ -d /etc/share/tt-rss ]; then
221 219
         function_check suspend_site
222
-        suspend_site ${RSS_READER_DOMAIN_NAME}
220
+        suspend_site ttrss
223 221
 
224 222
         function_check backup_database_to_friend
225 223
         backup_database_to_friend ttrss
@@ -232,7 +230,8 @@ function backup_remote_rss {
232 230
         function_check restart_site
233 231
         restart_site
234 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 235
     fi
237 236
 }
238 237
 
@@ -245,7 +244,7 @@ function restore_remote_rss {
245 244
         function_check rss_create_database
246 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 249
         if [ -d /etc/share/tt-rss ]; then
251 250
             if [ -d $temp_restore_dir/etc/share/tt-rss ]; then