From 48a8db20531104d99ae05be56e1bc7aed285b25e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 24 Jan 2018 15:36:29 +0000 Subject: [PATCH] Fixing ttrss backup and restore --- src/freedombone-app-rss | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index 37961f33..b58762dd 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -149,8 +149,6 @@ function upgrade_rss { function backup_local_rss { if [ -d /etc/share/tt-rss ]; then - RSS_READER_DOMAIN_NAME=$(get_completion_param "rss reader domain") - echo $"Backing up ttrss" function_check backup_database_to_usb @@ -168,7 +166,7 @@ function restore_local_rss { function_check rss_create_database rss_create_database - restore_database ttrss ${RSS_READER_DOMAIN_NAME} + restore_database ttrss if [ -d /etc/share/tt-rss ]; then if [ -d $temp_restore_dir/etc/share/tt-rss ]; then @@ -219,7 +217,7 @@ function restore_local_rss { function backup_remote_rss { if [ -d /etc/share/tt-rss ]; then function_check suspend_site - suspend_site ${RSS_READER_DOMAIN_NAME} + suspend_site ttrss function_check backup_database_to_friend backup_database_to_friend ttrss @@ -232,7 +230,8 @@ function backup_remote_rss { function_check restart_site restart_site else - echo $"RSS reader domain specified but not found in /etc/share/ttrss}" + echo $"/etc/share/tt-rss directory not found}" + exit 783532 fi } @@ -245,7 +244,7 @@ function restore_remote_rss { function_check rss_create_database rss_create_database - restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME} + restore_database_from_friend ttrss if [ -d /etc/share/tt-rss ]; then if [ -d $temp_restore_dir/etc/share/tt-rss ]; then