free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Since repos are included in the image, deprecate mirrors

This commit is contained in:
Bob Mottram 2017-06-18 13:56:03 +01:00
parent 9ce9d5dae4
commit e5db89ecb6
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-config
View File

@ -862,6 +862,8 @@ do
done done
function set_main_repo { function set_main_repo {
return
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Freedombone Control Panel" \ dialog --backtitle $"Freedombone Control Panel" \
@ -1123,7 +1125,7 @@ function interactive_config {
dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50 dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50
#choose_system_variant #choose_system_variant
set_main_repo #set_main_repo
choose_username choose_username
choose_full_name choose_full_name
choose_social_key_management choose_social_key_management

38
src/freedombone-controlpanel
View File

@ -268,6 +268,8 @@ function check_for_updates {
} }
function set_main_repo { function set_main_repo {
return
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Freedombone Control Panel" \ dialog --backtitle $"Freedombone Control Panel" \
@ -492,6 +494,8 @@ function show_users {
} }
function show_mirrors_password { function show_mirrors_password {
return
if [ ! /home/mirrors ]; then if [ ! /home/mirrors ]; then
return return
fi fi
@ -592,7 +596,7 @@ function show_about {
show_ssh_public_key show_ssh_public_key
show_domains show_domains
show_tahoelafs show_tahoelafs
show_mirrors_password #show_mirrors_password
show_users show_users
any_key any_key
} }
@ -2102,7 +2106,7 @@ function menu_top_level {
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Freedombone Control Panel" \ dialog --backtitle $"Freedombone Control Panel" \
--title $"Control Panel" \ --title $"Control Panel" \
--radiolist $"Choose an operation:" 29 70 21 \ --radiolist $"Choose an operation:" 28 70 20 \
1 $"About this system" off \ 1 $"About this system" off \
2 $"Passwords" off \ 2 $"Passwords" off \
3 $"Backup and Restore" off \ 3 $"Backup and Restore" off \
@ -2116,14 +2120,13 @@ function menu_top_level {
11 $"Email Menu" off \ 11 $"Email Menu" off \
12 $"Domain or User Blocking" off \ 12 $"Domain or User Blocking" off \
13 $"Security Settings" off \ 13 $"Security Settings" off \
14 $"Set the main repository (repo mirrors)" off \ 14 $"Change the name of this system" off \
15 $"Change the name of this system" off \ 15 $"Set a static local IP address" off \
16 $"Set a static local IP address" off \ 16 $"Wifi menu" off \
17 $"Wifi menu" off \ 17 $"Check for updates" off \
18 $"Check for updates" off \ 18 $"Power off the system" off \
19 $"Power off the system" off \ 19 $"Restart the system" off \
20 $"Restart the system" off \ 20 $"Exit" on 2> $data
21 $"Exit" on 2> $data
sel=$? sel=$?
case $sel in case $sel in
1) exit 1;; 1) exit 1;;
@ -2148,14 +2151,13 @@ function menu_top_level {
11) menu_email;; 11) menu_email;;
12) domain_blocking;; 12) domain_blocking;;
13) security_settings;; 13) security_settings;;
14) set_main_repo;; 14) change_system_name;;
15) change_system_name;; 15) set_static_IP;;
16) set_static_IP;; 16) menu_wifi;;
17) menu_wifi;; 17) check_for_updates;;
18) check_for_updates;; 18) shut_down_system;;
19) shut_down_system;; 19) restart_system;;
20) restart_system;; 20) break;;
21) break;;
esac esac
done done
} }

2
src/freedombone-upgrade
View File

@ -72,7 +72,7 @@ fi
update-ca-certificates update-ca-certificates
read_repo_servers read_repo_servers
${PROJECT_NAME}-mirrors #${PROJECT_NAME}-mirrors
if [ ! -d $PROJECT_DIR ]; then if [ ! -d $PROJECT_DIR ]; then
git_clone $PROJECT_REPO $PROJECT_DIR git_clone $PROJECT_REPO $PROJECT_DIR

2
src/freedombone-utils-repos
View File

@ -143,7 +143,7 @@ function create_mirrors {
if [[ $(is_completed $FUNCNAME) == "1" ]]; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
${PROJECT_NAME}-mirrors #${PROJECT_NAME}-mirrors
mark_completed $FUNCNAME mark_completed $FUNCNAME
} }

4
src/freedombone-utils-selector
View File

@ -572,7 +572,7 @@ function install_apps {
function_check add_users_after_install function_check add_users_after_install
add_users_after_install ${a} add_users_after_install ${a}
${PROJECT_NAME}-mirrors --app ${a} #${PROJECT_NAME}-mirrors --app ${a}
function_check lockdown_permissions function_check lockdown_permissions
lockdown_permissions lockdown_permissions
@ -609,7 +609,7 @@ function install_apps {
function_check lockdown_permissions function_check lockdown_permissions
lockdown_permissions lockdown_permissions
${PROJECT_NAME}-mirrors --app ${a} #${PROJECT_NAME}-mirrors --app ${a}
function_check install_completed function_check install_completed
install_completed ${a} install_completed ${a}