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

Do interactive app configuration before installing base system

This commit is contained in:
Bob Mottram 2016-10-15 17:20:04 +01:00
parent cdbbf0de22
commit 6debd6b5f5
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone-config
View File

@ -1345,6 +1345,7 @@ function interactive_config {
choose_static_ip choose_static_ip
choose_default_domain_name choose_default_domain_name
choose_email_address choose_email_address
install_apps_interactive
# delete the temporary configuration file # delete the temporary configuration file
if [ -f temp.cfg ]; then if [ -f temp.cfg ]; then

46
src/freedombone-utils-selector
View File

@ -402,32 +402,36 @@ function remove_apps {
update_installed_apps_list update_installed_apps_list
} }
function install_apps_interactive {
echo $"Interactive installer"
app_index=0
for a in "${APPS_AVAILABLE[@]}"
do
echo -n "${a}"
if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
echo -n $" not installed"
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
echo -n $" chosen"
# interactively obtain settings for this app
if [[ $(function_exists install_interactive_${a}) == "1" ]]; then
echo -n $" interactive"
install_interactive_${a}
fi
fi
fi
echo ""
app_index=$[app_index+1]
done
echo $"Interactive settings complete"
}
function install_apps { function install_apps {
is_interactive=$1 is_interactive=$1
# interactive install configuration for each app # interactive install configuration for each app
if [ ${is_interactive} ]; then if [ ${is_interactive} ]; then
echo $"Interactive installer" install_apps_interactive
app_index=0
for a in "${APPS_AVAILABLE[@]}"
do
echo -n "${a}"
if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
echo -n $" not installed"
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
echo -n $" chosen"
# interactively obtain settings for this app
if [[ $(function_exists install_interactive_${a}) == "1" ]]; then
echo -n $" interactive"
install_interactive_${a}
fi
fi
fi
echo ""
app_index=$[app_index+1]
done
echo $"Interactive settings complete"
fi fi
# now install the apps # now install the apps