diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 49125d30..9747947f 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -670,20 +670,6 @@ function hubzilla_renew_cert { fi } -function hubzilla_restore { - dialog --title $"Restore hubzilla from USB backup" \ - --backtitle $"Freedombone Control Panel" \ - --yesno $"\nInsert your USB backup drive and select 'yes' to continue" 16 60 - sel=$? - case $sel in - 1) return;; - 255) return;; - esac - clear - echo $'Enter your backup drive password:' - ${PROJECT_NAME}-restore-local $USB_DRIVE hubzilla -} - function hubzilla_channel_directory_server { if ! grep -q "Hubzilla domain" $COMPLETION_FILE; then dialog --title $"Hubzilla channel directory server" \ @@ -979,14 +965,13 @@ function menu_backup_restore { 1 $"Backup data to USB drive" off \ 2 $"Restore GPG key from USB keydrive" off \ 3 $"Restore data from USB drive" off \ - 4 $"Restore Hubzilla data from USB drive" off \ - 5 $"Configure remote backups" off \ - 6 $"Restore from remote backup" off \ - 7 $"Backup GPG key to USB (master keydrive)" off \ - 8 $"Backup GPG key to USB (fragment keydrive)" off \ - 9 $"Format a USB drive (LUKS encrypted)" off \ - 10 $"Remove backups from a USB drive" off \ - 11 $"Back to main menu" on 2> $data + 4 $"Configure remote backups" off \ + 5 $"Restore from remote backup" off \ + 6 $"Backup GPG key to USB (master keydrive)" off \ + 7 $"Backup GPG key to USB (fragment keydrive)" off \ + 8 $"Format a USB drive (LUKS encrypted)" off \ + 9 $"Remove backups from a USB drive" off \ + 10 $"Back to main menu" on 2> $data sel=$? case $sel in 1) break;; @@ -996,14 +981,13 @@ function menu_backup_restore { 1) backup_data;; 2) restore_gpg_key;; 3) restore_data;; - 4) hubzilla_restore;; - 5) configure_remote_backups;; - 6) restore_data_remote;; - 7) create_keydrive_master;; - 8) create_keydrive_fragment;; - 9) format_drive;; - 10) remove_backups;; - 11) break;; + 4) configure_remote_backups;; + 5) restore_data_remote;; + 6) create_keydrive_master;; + 7) create_keydrive_fragment;; + 8) format_drive;; + 9) remove_backups;; + 10) break;; esac done } @@ -1072,20 +1056,18 @@ function menu_hubzilla { dialog --backtitle $"Freedombone Control Panel" \ --title $"Hubzilla" \ --radiolist $"Choose an operation:" 13 70 4 \ - 1 $"Restore from usb backup" off \ - 2 $"Set channel directory server" off \ - 3 $"Renew SSL certificate" off \ - 4 $"Back to main menu" on 2> $data + 1 $"Set channel directory server" off \ + 2 $"Renew SSL certificate" off \ + 3 $"Back to main menu" on 2> $data sel=$? case $sel in 1) break;; 255) break;; esac case $(cat $data) in - 1) hubzilla_restore;; - 2) hubzilla_channel_directory_server;; - 3) hubzilla_renew_cert;; - 4) break;; + 1) hubzilla_channel_directory_server;; + 2) hubzilla_renew_cert;; + 3) break;; esac done }