From f4d4aeacfe495601b23899a1e8e24e1e2eb72d04 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 10 Jul 2016 14:49:16 +0100
Subject: [PATCH] Move remote cjdns restore to app script

---
 src/freedombone-app-cjdns      | 15 +++++++++++++--
 src/freedombone-restore-remote | 20 --------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/freedombone-app-cjdns b/src/freedombone-app-cjdns
index d347bc5e..a6e3b2b2 100755
--- a/src/freedombone-app-cjdns
+++ b/src/freedombone-app-cjdns
@@ -42,7 +42,7 @@ CJDCMD_REPO="https://github.com/inhies/cjdcmd"
 CJDCMD_COMMIT='973cca6ed0eecf9041c3403a40193c0b1291b808'
 
 function reconfigure_cjdns {
-    echo -n ''
+	echo -n ''
 }
 
 function upgrade_cjdns {
@@ -148,7 +148,18 @@ function backup_remote_cjdns {
 }
 
 function restore_remote_cjdns {
-	echo -n ''
+	if [ -d $SERVER_DIRECTORY/backup/cjdns ]; then
+		echo $"Restoring cjdns installation"
+		temp_restore_dir=/root/tempcjdns
+		function_check restore_directory_from_friend
+		restore_directory_from_friend $temp_restore_dir cjdns
+		rm -rf /etc/cjdns
+		cp -r $temp_restore_dir/etc/cjdns /etc/
+		if [ ! "$?" = "0" ]; then
+			exit 7438
+		fi
+		rm -rf $temp_restore_dir
+	fi
 }
 
 function remove_cjdns {
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index e9025725..c0cd7fa2 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -666,25 +666,6 @@ function restore_mailing_list {
 	fi
 }
 
-function restore_cjdns {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'cjdns' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/cjdns ]; then
-		echo $"Restoring cjdns installation"
-		temp_restore_dir=/root/tempcjdns
-		restore_directory_from_friend $temp_restore_dir cjdns
-		rm -rf /etc/cjdns
-		cp -r $temp_restore_dir/etc/cjdns /etc/
-		if [ ! "$?" = "0" ]; then
-			exit 7438
-		fi
-		rm -rf $temp_restore_dir
-	fi
-}
-
 function restore_voip {
 	if [[ $RESTORE_APP != 'all' ]]; then
 		if [[ $RESTORE_APP != 'voip' ]]; then
@@ -813,7 +794,6 @@ restore_mailing_list
 restore_email
 #restore_apps remote
 
-restore_cjdns
 restore_voip
 restore_tox
 restore_dlna