Choosing apps

This commit is contained in:
Bob Mottram 2016-09-30 23:47:08 +01:00
parent 14fd98f08e
commit 16a4344257
1 changed files with 10 additions and 4 deletions

View File

@ -217,7 +217,11 @@ function choose_apps_for_variant {
"${variants_list}" == "$variant_name "* || \
"${variants_list}" == *" $variant_name "* || \
"${variants_list}" == *" $variant_name" ]]; then
APPS_CHOSEN+=("1")
if [[ $(app_is_removed ${a}) == "0" ]]; then
APPS_CHOSEN+=("1")
else
APPS_CHOSEN+=("0")
fi
else
APPS_CHOSEN+=("0")
fi
@ -271,7 +275,9 @@ function install_apps {
if [ ${is_interactive} ]; then
# interactively obtain settings for this app
if [[ $(function_exists install_interactive_${a}) == "1" ]]; then
install_interactive_${a}
if [[ $(app_is_removed ${a}) == "0" ]]; then
install_interactive_${a}
fi
fi
fi
fi
@ -286,9 +292,9 @@ function install_apps {
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
if [ ${is_interactive} ]; then
reinstall_app ${a}
echo $"Installing application: ${a}"
echo $"Installing application from interactive: ${a}"
install_${a}
echo $"${a} was installed"
echo $"${a} was installed from interactive"
else
if [[ $(app_is_removed ${a}) == "0" ]]; then
echo $"Installing application: ${a}"