Browse Source

Move remote rss restore to app script

Bob Mottram 8 years ago
parent
commit
f869db0ca0
2 changed files with 13 additions and 20 deletions
  1. 13
    1
      src/freedombone-app-rss
  2. 0
    19
      src/freedombone-restore-remote

+ 13
- 1
src/freedombone-app-rss View File

144
 }
144
 }
145
 
145
 
146
 function restore_remote_rss {
146
 function restore_remote_rss {
147
-	echo -n ''
147
+	if grep -q "RSS reader domain" $COMPLETION_FILE; then
148
+		echo $"Restoring ttrss"
149
+		RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
150
+		function_check restore_database_from_friend
151
+		restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME}
152
+		if [ -d $SERVER_DIRECTORY/backup/ttrss ]; then
153
+			chown -R www-data:www-data /etc/share/tt-rss
154
+		fi
155
+		if [ -d /root/tempttrss ]; then
156
+			rm -rf /root/tempttrss
157
+		fi
158
+		echo $"Restore of ttrss complete"
159
+	fi
148
 }
160
 }
149
 
161
 
150
 function remove_rss {
162
 function remove_rss {

+ 0
- 19
src/freedombone-restore-remote View File

666
 	fi
666
 	fi
667
 }
667
 }
668
 
668
 
669
-function restore_rss {
670
-	if [[ $RESTORE_APP != 'all' ]]; then
671
-		if [[ $RESTORE_APP != 'ttrss' ]]; then
672
-			return
673
-		fi
674
-	fi
675
-	if grep -q "RSS reader domain" $COMPLETION_FILE; then
676
-		RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
677
-		restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME}
678
-		if [ -d $SERVER_DIRECTORY/backup/ttrss ]; then
679
-			chown -R www-data:www-data /etc/share/tt-rss
680
-		fi
681
-		if [ -d /root/tempttrss ]; then
682
-			rm -rf /root/tempttrss
683
-		fi
684
-	fi
685
-}
686
-
687
 function restore_syncthing {
669
 function restore_syncthing {
688
 	if [[ $RESTORE_APP != 'all' ]]; then
670
 	if [[ $RESTORE_APP != 'all' ]]; then
689
 		if [[ $RESTORE_APP != 'syncthing' ]]; then
671
 		if [[ $RESTORE_APP != 'syncthing' ]]; then
1052
 restore_mailing_list
1034
 restore_mailing_list
1053
 restore_email
1035
 restore_email
1054
 
1036
 
1055
-restore_rss
1056
 restore_syncthing
1037
 restore_syncthing
1057
 restore_mediagoblin
1038
 restore_mediagoblin
1058
 restore_gogs
1039
 restore_gogs