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

Different method of interactive install allows the user to select apps from a list

This commit is contained in:
Bob Mottram 2016-10-17 10:45:12 +01:00
parent 6dd890b323
commit 3d259de720
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone
View File

@ -300,7 +300,7 @@ upgrade_installation_from_previous_versions
setup_utils setup_utils
setup_email setup_email
setup_web setup_web
setup_apps setup_apps $command_options
setup_final setup_final
echo "${PROJECT_NAME} installation is complete" echo "${PROJECT_NAME} installation is complete"

12
src/freedombone-config
View File

@ -1346,18 +1346,6 @@ function interactive_config {
choose_default_domain_name choose_default_domain_name
choose_email_address choose_email_address
function_check create_completion_file
create_completion_file
function_ckeck detect_installable_apps
detect_installable_apps
function_check choose_apps_for_variant
choose_apps_for_variant "$SYSTEM_TYPE"
function_check install_apps_interactive
install_apps_interactive
# delete the temporary configuration file # delete the temporary configuration file
if [ -f temp.cfg ]; then if [ -f temp.cfg ]; then
shred -zu temp.cfg shred -zu temp.cfg

12
src/freedombone-utils-setup
View File

@ -513,6 +513,8 @@ function upgrade_apps {
} }
function setup_apps { function setup_apps {
is_interactive=$1
function_check create_completion_file function_check create_completion_file
create_completion_file create_completion_file
@ -532,8 +534,14 @@ function setup_apps {
function_check upgrade_apps function_check upgrade_apps
upgrade_apps upgrade_apps
function_check install_apps if [[ $is_interactive == "menuconfig"* ]]; then
install_apps ${PROJECT_NAME}-addremove
fi
if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then
function_check install_apps
install_apps
fi
} }
function combine_all_scripts { function combine_all_scripts {