From e5db89ecb62dd2fdcda7e9f888d6728b198fc558 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 18 Jun 2017 13:56:03 +0100
Subject: [PATCH] Since repos are included in the image, deprecate mirrors

---
 src/freedombone-config         |  4 +++-
 src/freedombone-controlpanel   | 38 ++++++++++++++++++----------------
 src/freedombone-upgrade        |  2 +-
 src/freedombone-utils-repos    |  2 +-
 src/freedombone-utils-selector |  4 ++--
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/freedombone-config b/src/freedombone-config
index 4e4abaac..c89ce275 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -862,6 +862,8 @@ do
 done
 
 function set_main_repo {
+    return
+
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
     dialog --backtitle $"Freedombone Control Panel" \
@@ -1123,7 +1125,7 @@ function interactive_config {
     dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50
 
     #choose_system_variant
-    set_main_repo
+    #set_main_repo
     choose_username
     choose_full_name
     choose_social_key_management
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 073f5749..82be334b 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -268,6 +268,8 @@ function check_for_updates {
 }
 
 function set_main_repo {
+    return
+
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
     dialog --backtitle $"Freedombone Control Panel" \
@@ -492,6 +494,8 @@ function show_users {
 }
 
 function show_mirrors_password {
+    return
+
     if [ ! /home/mirrors ]; then
         return
     fi
@@ -592,7 +596,7 @@ function show_about {
     show_ssh_public_key
     show_domains
     show_tahoelafs
-    show_mirrors_password
+    #show_mirrors_password
     show_users
     any_key
 }
@@ -2102,7 +2106,7 @@ function menu_top_level {
         trap "rm -f $data" 0 1 2 5 15
         dialog --backtitle $"Freedombone Control Panel" \
                --title $"Control Panel" \
-               --radiolist $"Choose an operation:" 29 70 21 \
+               --radiolist $"Choose an operation:" 28 70 20 \
                1 $"About this system" off \
                2 $"Passwords" off \
                3 $"Backup and Restore" off \
@@ -2116,14 +2120,13 @@ function menu_top_level {
                11 $"Email Menu" off \
                12 $"Domain or User Blocking" off \
                13 $"Security Settings" off \
-               14 $"Set the main repository (repo mirrors)" off \
-               15 $"Change the name of this system" off \
-               16 $"Set a static local IP address" off \
-               17 $"Wifi menu" off \
-               18 $"Check for updates" off \
-               19 $"Power off the system" off \
-               20 $"Restart the system" off \
-               21 $"Exit" on 2> $data
+               14 $"Change the name of this system" off \
+               15 $"Set a static local IP address" off \
+               16 $"Wifi menu" off \
+               17 $"Check for updates" off \
+               18 $"Power off the system" off \
+               19 $"Restart the system" off \
+               20 $"Exit" on 2> $data
         sel=$?
         case $sel in
             1) exit 1;;
@@ -2148,14 +2151,13 @@ function menu_top_level {
             11) menu_email;;
             12) domain_blocking;;
             13) security_settings;;
-            14) set_main_repo;;
-            15) change_system_name;;
-            16) set_static_IP;;
-            17) menu_wifi;;
-            18) check_for_updates;;
-            19) shut_down_system;;
-            20) restart_system;;
-            21) break;;
+            14) change_system_name;;
+            15) set_static_IP;;
+            16) menu_wifi;;
+            17) check_for_updates;;
+            18) shut_down_system;;
+            19) restart_system;;
+            20) break;;
         esac
     done
 }
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 56978264..e3ebf195 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -72,7 +72,7 @@ fi
 update-ca-certificates
 
 read_repo_servers
-${PROJECT_NAME}-mirrors
+#${PROJECT_NAME}-mirrors
 
 if [ ! -d $PROJECT_DIR ]; then
     git_clone $PROJECT_REPO $PROJECT_DIR
diff --git a/src/freedombone-utils-repos b/src/freedombone-utils-repos
index aada4963..4753d452 100755
--- a/src/freedombone-utils-repos
+++ b/src/freedombone-utils-repos
@@ -143,7 +143,7 @@ function create_mirrors {
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
         return
     fi
-    ${PROJECT_NAME}-mirrors
+    #${PROJECT_NAME}-mirrors
     mark_completed $FUNCNAME
 }
 
diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector
index f9c644e9..8e1de737 100755
--- a/src/freedombone-utils-selector
+++ b/src/freedombone-utils-selector
@@ -572,7 +572,7 @@ function install_apps {
                             function_check add_users_after_install
                             add_users_after_install ${a}
 
-                            ${PROJECT_NAME}-mirrors --app ${a}
+                            #${PROJECT_NAME}-mirrors --app ${a}
 
                             function_check lockdown_permissions
                             lockdown_permissions
@@ -609,7 +609,7 @@ function install_apps {
                                 function_check lockdown_permissions
                                 lockdown_permissions
 
-                                ${PROJECT_NAME}-mirrors --app ${a}
+                                #${PROJECT_NAME}-mirrors --app ${a}
 
                                 function_check install_completed
                                 install_completed ${a}